Commit 24669f75 authored by Jes Sorensen's avatar Jes Sorensen Committed by
Browse files

[SCSI] SCSI core kmalloc2kzalloc 



Change the core SCSI code to use kzalloc rather than kmalloc+memset
where possible.

Signed-off-by: default avatarJes Sorensen <jes@sgi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent b9a33ceb

drivers/scsi/hosts.c

+1 −2
Original line number Diff line number Diff line
@@ -306,10 +306,9 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) 
		dump_stack();

        }



	shost = kmalloc(sizeof(struct Scsi_Host) + privsize, gfp_mask);

	shost = kzalloc(sizeof(struct Scsi_Host) + privsize, gfp_mask);

	if (!shost)

		return NULL;

	memset(shost, 0, sizeof(struct Scsi_Host) + privsize);



	spin_lock_init(&shost->default_lock);

	scsi_assign_lock(shost, &shost->default_lock);

drivers/scsi/scsi.c

+1 −2
Original line number Diff line number Diff line
@@ -136,9 +136,8 @@ struct scsi_request *scsi_allocate_request(struct scsi_device *sdev, 
	const int size = offset + sizeof(struct request);

	struct scsi_request *sreq;

  

	sreq = kmalloc(size, gfp_mask);

	sreq = kzalloc(size, gfp_mask);

	if (likely(sreq != NULL)) {

		memset(sreq, 0, size);

		sreq->sr_request = (struct request *)(((char *)sreq) + offset);

		sreq->sr_device = sdev;

		sreq->sr_host = sdev->host;

drivers/scsi/scsi_debug.c

+3 −6
Original line number Diff line number Diff line
@@ -1061,13 +1061,12 @@ static struct sdebug_dev_info * devInfoReg(struct scsi_device * sdev) 
		}

	}

	if (NULL == open_devip) { /* try and make a new one */

		open_devip = kmalloc(sizeof(*open_devip),GFP_KERNEL);

		open_devip = kzalloc(sizeof(*open_devip),GFP_KERNEL);

		if (NULL == open_devip) {

			printk(KERN_ERR "%s: out of memory at line %d\n",

				__FUNCTION__, __LINE__);

			return NULL;

		}

		memset(open_devip, 0, sizeof(*open_devip));

		open_devip->sdbg_host = sdbg_host;

		list_add_tail(&open_devip->dev_list,

		&sdbg_host->dev_info_list);
@@ -1814,7 +1813,7 @@ static int sdebug_add_adapter(void) 
        struct sdebug_dev_info *sdbg_devinfo;

        struct list_head *lh, *lh_sf;



        sdbg_host = kmalloc(sizeof(*sdbg_host),GFP_KERNEL);

        sdbg_host = kzalloc(sizeof(*sdbg_host), GFP_KERNEL);



        if (NULL == sdbg_host) {

                printk(KERN_ERR "%s: out of memory at line %d\n",
@@ -1822,19 +1821,17 @@ static int sdebug_add_adapter(void) 
                return -ENOMEM;

        }



        memset(sdbg_host, 0, sizeof(*sdbg_host));

        INIT_LIST_HEAD(&sdbg_host->dev_info_list);



	devs_per_host = scsi_debug_num_tgts * scsi_debug_max_luns;

        for (k = 0; k < devs_per_host; k++) {

                sdbg_devinfo = kmalloc(sizeof(*sdbg_devinfo),GFP_KERNEL);

                sdbg_devinfo = kzalloc(sizeof(*sdbg_devinfo), GFP_KERNEL);

                if (NULL == sdbg_devinfo) {

                        printk(KERN_ERR "%s: out of memory at line %d\n",

                               __FUNCTION__, __LINE__);

                        error = -ENOMEM;

			goto clean;

                }

                memset(sdbg_devinfo, 0, sizeof(*sdbg_devinfo));

                sdbg_devinfo->sdbg_host = sdbg_host;

                list_add_tail(&sdbg_devinfo->dev_list,

                              &sdbg_host->dev_info_list);

drivers/scsi/scsi_ioctl.c

+1 −2
Original line number Diff line number Diff line
@@ -241,10 +241,9 @@ int scsi_ioctl_send_command(struct scsi_device *sdev, 
		buf_needed = (buf_needed + 511) & ~511;

		if (buf_needed > MAX_BUF)

			buf_needed = MAX_BUF;

		buf = kmalloc(buf_needed, gfp_mask);

		buf = kzalloc(buf_needed, gfp_mask);

		if (!buf)

			return -ENOMEM;

		memset(buf, 0, buf_needed);

		if (inlen == 0) {

			data_direction = DMA_FROM_DEVICE;

		} else if (outlen == 0 ) {

drivers/scsi/scsi_lib.c

+2 −3
Original line number Diff line number Diff line
@@ -286,10 +286,9 @@ int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd, 
	int result;

	

	if (sshdr) {

		sense = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_NOIO);

		sense = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_NOIO);

		if (!sense)

			return DRIVER_ERROR << 24;

		memset(sense, 0, SCSI_SENSE_BUFFERSIZE);

	}

	result = scsi_execute(sdev, cmd, data_direction, buffer, bufflen,

			      sense, timeout, retries, 0);