Messages in this thread Patch in this message | | | Date | Fri, 21 Jul 2006 13:32:10 +0200 | Subject | [PATCH] block: Conversions from kmalloc+memset to k(z|c)alloc | From | takis@issaris ... |
| |
From: Panagiotis Issaris <takis@issaris.org>
block: Conversions from kmalloc+memset to kzalloc
Signed-off-by: Panagiotis Issaris <takis@issaris.org> --- block/cfq-iosched.c | 4 +--- block/elevator.c | 3 +-- block/scsi_ioctl.c | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 102ebc2..d3d095f 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -2231,12 +2231,10 @@ static void *cfq_init_queue(request_queu struct cfq_data *cfqd; int i; - cfqd = kmalloc(sizeof(*cfqd), GFP_KERNEL); + cfqd = kzalloc(sizeof(*cfqd), GFP_KERNEL); if (!cfqd) return NULL; - memset(cfqd, 0, sizeof(*cfqd)); - for (i = 0; i < CFQ_PRIO_LISTS; i++) INIT_LIST_HEAD(&cfqd->rr_list[i]); diff --git a/block/elevator.c b/block/elevator.c index bc7baee..e51febf 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -153,9 +153,8 @@ static struct kobj_type elv_ktype; static elevator_t *elevator_alloc(struct elevator_type *e) { - elevator_t *eq = kmalloc(sizeof(elevator_t), GFP_KERNEL); + elevator_t *eq = kzalloc(sizeof(elevator_t), GFP_KERNEL); if (eq) { - memset(eq, 0, sizeof(*eq)); eq->ops = &e->ops; eq->elevator_type = e; kobject_init(&eq->kobj); diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index b33eda2..f6a8bea 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -409,11 +409,9 @@ int sg_scsi_ioctl(struct file *file, str bytes = max(in_len, out_len); if (bytes) { - buffer = kmalloc(bytes, q->bounce_gfp | GFP_USER| __GFP_NOWARN); + buffer = kzalloc(bytes, q->bounce_gfp | GFP_USER| __GFP_NOWARN); if (!buffer) return -ENOMEM; - - memset(buffer, 0, bytes); } rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_WAIT); -- 1.4.2.rc1.ge7a0-dirty - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |