RE: [PATCH 07] drivers/block/cciss.c: kmalloc + memset conversion to kzalloc

[Miller, Mike (OS Dev)]

> -----Original Message-----
> From: Mariusz Kozlowski [mailto:m.kozlowski@xxxxxxxxxx] 
> Sent: Tuesday, July 31, 2007 12:04 PM
> To: linux-kernel@xxxxxxxxxxxxxxx
> Cc: kernel-janitors@xxxxxxxxxxxxxxx; Andrew Morton; ISS 
> StorageDev; axboe@xxxxxxxxx
> Subject: [PATCH 07] drivers/block/cciss.c: kmalloc + memset 
> conversion to kzalloc
> 
> Signed-off-by: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>

Acked-by: Mike Miller <mike.miller@xxxxxx>

> 
>  drivers/block/cciss.c | 104285 -> 104168 (-117 bytes)  
> drivers/block/cciss.o | 277400 -> 277124 (-276 bytes)
> 
>  drivers/block/cciss.c |   16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> --- linux-2.6.23-rc1-mm1-a/drivers/block/cciss.c	
> 2007-07-26 13:07:41.000000000 +0200
> +++ linux-2.6.23-rc1-mm1-b/drivers/block/cciss.c	
> 2007-07-31 12:57:50.000000000 +0200
> @@ -1977,12 +1977,13 @@ cciss_read_capacity(int ctlr, int logvol  {
>  	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
>  		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 log  {
>  	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 log
>  	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)
> 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/