[PATCH] pktcdvd: use kcalloc and kzalloc
Use kcalloc and kzalloc in pktcdvd. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Родитель
06e7ab53f4
Коммит
1107d2e035
|
@ -112,10 +112,9 @@ static struct bio *pkt_bio_alloc(int nr_iovecs)
|
||||||
goto no_bio;
|
goto no_bio;
|
||||||
bio_init(bio);
|
bio_init(bio);
|
||||||
|
|
||||||
bvl = kmalloc(nr_iovecs * sizeof(struct bio_vec), GFP_KERNEL);
|
bvl = kcalloc(nr_iovecs, sizeof(struct bio_vec), GFP_KERNEL);
|
||||||
if (!bvl)
|
if (!bvl)
|
||||||
goto no_bvl;
|
goto no_bvl;
|
||||||
memset(bvl, 0, nr_iovecs * sizeof(struct bio_vec));
|
|
||||||
|
|
||||||
bio->bi_max_vecs = nr_iovecs;
|
bio->bi_max_vecs = nr_iovecs;
|
||||||
bio->bi_io_vec = bvl;
|
bio->bi_io_vec = bvl;
|
||||||
|
@ -137,10 +136,9 @@ static struct packet_data *pkt_alloc_packet_data(void)
|
||||||
int i;
|
int i;
|
||||||
struct packet_data *pkt;
|
struct packet_data *pkt;
|
||||||
|
|
||||||
pkt = kmalloc(sizeof(struct packet_data), GFP_KERNEL);
|
pkt = kzalloc(sizeof(struct packet_data), GFP_KERNEL);
|
||||||
if (!pkt)
|
if (!pkt)
|
||||||
goto no_pkt;
|
goto no_pkt;
|
||||||
memset(pkt, 0, sizeof(struct packet_data));
|
|
||||||
|
|
||||||
pkt->w_bio = pkt_bio_alloc(PACKET_MAX_SIZE);
|
pkt->w_bio = pkt_bio_alloc(PACKET_MAX_SIZE);
|
||||||
if (!pkt->w_bio)
|
if (!pkt->w_bio)
|
||||||
|
@ -2492,10 +2490,9 @@ static int pkt_setup_dev(struct pkt_ctrl_command *ctrl_cmd)
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
}
|
}
|
||||||
|
|
||||||
pd = kmalloc(sizeof(struct pktcdvd_device), GFP_KERNEL);
|
pd = kzalloc(sizeof(struct pktcdvd_device), GFP_KERNEL);
|
||||||
if (!pd)
|
if (!pd)
|
||||||
return ret;
|
return ret;
|
||||||
memset(pd, 0, sizeof(struct pktcdvd_device));
|
|
||||||
|
|
||||||
pd->rb_pool = mempool_create(PKT_RB_POOL_SIZE, pkt_rb_alloc, pkt_rb_free, NULL);
|
pd->rb_pool = mempool_create(PKT_RB_POOL_SIZE, pkt_rb_alloc, pkt_rb_free, NULL);
|
||||||
if (!pd->rb_pool)
|
if (!pd->rb_pool)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче