Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc8a7b11 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block 

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  BLOCK: Hide the contents of linux/bio.h if CONFIG_BLOCK=n
  sysace: HDIO_GETGEO has it's own method for ages
  drivers/block/cpqarray.c: better error handling and kmalloc + memset conversion to k[cz]alloc
  drivers/block/cciss.c: kmalloc + memset conversion to kzalloc
  Clean up duplicate includes in drivers/block/
  Fix remap handling by blktrace
  [PATCH] remove mm/filemap.c:file_send_actor()
parents d291676c 02a5e0ac

block/ll_rw_blk.c

+4 −0
Original line number Diff line number Diff line
@@ -3047,6 +3047,10 @@ static inline void blk_partition_remap(struct bio *bio) 


		bio->bi_sector += p->start_sect;

		bio->bi_bdev = bdev->bd_contains;



		blk_add_trace_remap(bdev_get_queue(bio->bi_bdev), bio,

				    bdev->bd_dev, bio->bi_sector,

				    bio->bi_sector - p->start_sect);

	}

}

drivers/block/cciss.c

+8 −8
Original line number Diff line number Diff line
@@ -1977,12 +1977,13 @@ cciss_read_capacity(int ctlr, int logvol, int withirq, sector_t *total_size, 
{

	ReadCapdata_struct *buf;

	int return_code;

	buf = kmalloc(sizeof(ReadCapdata_struct), GFP_KERNEL);

	if (buf == NULL) {



	buf = kzalloc(sizeof(ReadCapdata_struct), GFP_KERNEL);

	if (!buf) {

		printk(KERN_WARNING "cciss: out of memory\n");

		return;

	}

	memset(buf, 0, sizeof(ReadCapdata_struct));



	if (withirq)

		return_code = sendcmd_withirq(CCISS_READ_CAPACITY,

				ctlr, buf, sizeof(ReadCapdata_struct),
@@ -2003,7 +2004,6 @@ cciss_read_capacity(int ctlr, int logvol, int withirq, sector_t *total_size, 
		printk(KERN_INFO "      blocks= %llu block_size= %d\n",

		(unsigned long long)*total_size+1, *block_size);

	kfree(buf);

	return;

}



static void
@@ -2011,12 +2011,13 @@ cciss_read_capacity_16(int ctlr, int logvol, int withirq, sector_t *total_size, 
{

	ReadCapdata_struct_16 *buf;

	int return_code;

	buf = kmalloc(sizeof(ReadCapdata_struct_16), GFP_KERNEL);

	if (buf == NULL) {



	buf = kzalloc(sizeof(ReadCapdata_struct_16), GFP_KERNEL);

	if (!buf) {

		printk(KERN_WARNING "cciss: out of memory\n");

		return;

	}

	memset(buf, 0, sizeof(ReadCapdata_struct_16));



	if (withirq) {

		return_code = sendcmd_withirq(CCISS_READ_CAPACITY_16,

			ctlr, buf, sizeof(ReadCapdata_struct_16),
@@ -2038,7 +2039,6 @@ cciss_read_capacity_16(int ctlr, int logvol, int withirq, sector_t *total_size, 
	printk(KERN_INFO "      blocks= %llu block_size= %d\n",

	       (unsigned long long)*total_size+1, *block_size);

	kfree(buf);

	return;

}



static int cciss_revalidate(struct gendisk *disk)

drivers/block/cpqarray.c

+26 −52
Original line number Diff line number Diff line
@@ -420,18 +420,17 @@ static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev) 
			goto Enomem2;

	}



	hba[i]->cmd_pool = (cmdlist_t *)pci_alloc_consistent(

	hba[i]->cmd_pool = pci_alloc_consistent(

		hba[i]->pci_dev, NR_CMDS * sizeof(cmdlist_t),

		&(hba[i]->cmd_pool_dhandle));

	hba[i]->cmd_pool_bits = kmalloc(

		((NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG)*sizeof(unsigned long),

	hba[i]->cmd_pool_bits = kcalloc(

		(NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG, sizeof(unsigned long),

		GFP_KERNEL);



	if (!hba[i]->cmd_pool_bits || !hba[i]->cmd_pool)

			goto Enomem1;



	memset(hba[i]->cmd_pool, 0, NR_CMDS * sizeof(cmdlist_t));

	memset(hba[i]->cmd_pool_bits, 0, ((NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG)*sizeof(unsigned long));

	printk(KERN_INFO "cpqarray: Finding drives on %s",

		hba[i]->devname);
@@ -1660,45 +1659,30 @@ static void getgeometry(int ctlr) 


	info_p->log_drv_map = 0;	

	

	id_ldrive = kmalloc(sizeof(id_log_drv_t), GFP_KERNEL);

	if(id_ldrive == NULL)

	{

	id_ldrive = kzalloc(sizeof(id_log_drv_t), GFP_KERNEL);

	if (!id_ldrive)	{

		printk( KERN_ERR "cpqarray:  out of memory.\n");

		return;

		goto err_0;

	}



	id_ctlr_buf = kmalloc(sizeof(id_ctlr_t), GFP_KERNEL);

	if(id_ctlr_buf == NULL)

	{

		kfree(id_ldrive);

	id_ctlr_buf = kzalloc(sizeof(id_ctlr_t), GFP_KERNEL);

	if (!id_ctlr_buf) {

		printk( KERN_ERR "cpqarray:  out of memory.\n");

		return;

		goto err_1;

	}



	id_lstatus_buf = kmalloc(sizeof(sense_log_drv_stat_t), GFP_KERNEL);

	if(id_lstatus_buf == NULL)

	{

		kfree(id_ctlr_buf);

		kfree(id_ldrive);

	id_lstatus_buf = kzalloc(sizeof(sense_log_drv_stat_t), GFP_KERNEL);

	if (!id_lstatus_buf) {

		printk( KERN_ERR "cpqarray:  out of memory.\n");

		return;

		goto err_2;

	}



	sense_config_buf = kmalloc(sizeof(config_t), GFP_KERNEL);

	if(sense_config_buf == NULL)

	{

		kfree(id_lstatus_buf);

		kfree(id_ctlr_buf);

		kfree(id_ldrive);

	sense_config_buf = kzalloc(sizeof(config_t), GFP_KERNEL);

	if (!sense_config_buf) {

		printk( KERN_ERR "cpqarray:  out of memory.\n");

		return;

		goto err_3;

	}



	memset(id_ldrive, 0, sizeof(id_log_drv_t));

	memset(id_ctlr_buf, 0, sizeof(id_ctlr_t));

	memset(id_lstatus_buf, 0, sizeof(sense_log_drv_stat_t));

	memset(sense_config_buf, 0, sizeof(config_t));



	info_p->phys_drives = 0;

	info_p->log_drv_map = 0;

	info_p->drv_assign_map = 0;
@@ -1712,13 +1696,8 @@ static void getgeometry(int ctlr) 
		 * so the idastubopen will fail on all logical drives

		 * on the controller.

		 */

		 /* Free all the buffers and return */ 

		printk(KERN_ERR "cpqarray: error sending ID controller\n");

		kfree(sense_config_buf);

                kfree(id_lstatus_buf);

                kfree(id_ctlr_buf);

                kfree(id_ldrive);

                return;

                goto err_4;

        }



	info_p->log_drives = id_ctlr_buf->nr_drvs;
@@ -1764,12 +1743,7 @@ static void getgeometry(int ctlr) 
				" failed to report status of logical drive %d\n"

			 "Access to this controller has been disabled\n",

				ctlr, log_unit);

			/* Free all the buffers and return */

                	kfree(sense_config_buf);

                	kfree(id_lstatus_buf);

                	kfree(id_ctlr_buf);

                	kfree(id_ldrive);

                	return;

                	goto err_4;

		}

		/*

		   Make sure the logical drive is configured
@@ -1798,14 +1772,8 @@ static void getgeometry(int ctlr) 
				 sizeof(config_t), 0, 0, log_unit);

				if (ret_code == IO_ERROR) {

					info_p->log_drv_map = 0;

					/* Free all the buffers and return */

                			printk(KERN_ERR "cpqarray: error sending sense config\n");

                			kfree(sense_config_buf);

                			kfree(id_lstatus_buf);

                			kfree(id_ctlr_buf);

                			kfree(id_ldrive);

                			return;



                			goto err_4;

				}



				info_p->phys_drives =
@@ -1820,12 +1788,18 @@ static void getgeometry(int ctlr) 
			log_index = log_index + 1;

		}		/* end of if logical drive configured */

	}			/* end of for log_unit */



	/* Free all the buffers and return */

err_4:

	kfree(sense_config_buf);

  	kfree(id_ldrive);

err_3:

  	kfree(id_lstatus_buf);

err_2:

	kfree(id_ctlr_buf);

err_1:

  	kfree(id_ldrive);

err_0:

	return;



}



static void __exit cpqarray_exit(void)

drivers/block/viodasd.c

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include <linux/dma-mapping.h>

#include <linux/completion.h>

#include <linux/device.h>

#include <linux/kernel.h>



#include <asm/uaccess.h>

#include <asm/vio.h>

drivers/block/xsysace.c

+10 −19
Original line number Diff line number Diff line
@@ -902,26 +902,17 @@ static int ace_release(struct inode *inode, struct file *filp) 
	return 0;

}



static int ace_ioctl(struct inode *inode, struct file *filp,

		     unsigned int cmd, unsigned long arg)

static int ace_getgeo(struct block_device *bdev, struct hd_geometry *geo)

{

	struct ace_device *ace = inode->i_bdev->bd_disk->private_data;

	struct hd_geometry __user *geo = (struct hd_geometry __user *)arg;

	struct hd_geometry g;

	dev_dbg(ace->dev, "ace_ioctl()\n");



	switch (cmd) {

	case HDIO_GETGEO:

		g.heads = ace->cf_id.heads;

		g.sectors = ace->cf_id.sectors;

		g.cylinders = ace->cf_id.cyls;

		g.start = 0;

		return copy_to_user(geo, &g, sizeof(g)) ? -EFAULT : 0;

	struct ace_device *ace = bdev->bd_disk->private_data;



	default:

		return -ENOTTY;

	}

	return -ENOTTY;

	dev_dbg(ace->dev, "ace_getgeo()\n");



	geo->heads = ace->cf_id.heads;

	geo->sectors = ace->cf_id.sectors;

	geo->cylinders = ace->cf_id.cyls;



	return 0;

}



static struct block_device_operations ace_fops = {
@@ -930,7 +921,7 @@ static struct block_device_operations ace_fops = { 
	.release = ace_release,

	.media_changed = ace_media_changed,

	.revalidate_disk = ace_revalidate_disk,

	.ioctl = ace_ioctl,

	.getgeo = ace_getgeo,

};



/* --------------------------------------------------------------------