From: Chaitanya Kulkarni Date: Thu, 20 Jun 2019 04:56:58 +0000 (-0700) Subject: null_blk: remove duplicate 0 initialization X-Git-Tag: Ubuntu-5.10.0-12.13~5026^2~104 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8c54803b98d5907b45fe98270be5ed4fbc7e4c4c;p=mirror_ubuntu-hirsute-kernel.git null_blk: remove duplicate 0 initialization In function null_add_dev() struct nullb *nullb member is allocated using kzalloc_node() which returns 0red memory. In function setup_queues() which is called from the null_add_dev(), on successful queue allocation we set the nullb->nr_queues = 0 which is not needed due to earlier use of kzalloc_node(). Signed-off-by: Chaitanya Kulkarni Signed-off-by: Jens Axboe --- diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c index 2a4f8bc4f930..22303e59a274 100644 --- a/drivers/block/null_blk_main.c +++ b/drivers/block/null_blk_main.c @@ -1489,7 +1489,6 @@ static int setup_queues(struct nullb *nullb) if (!nullb->queues) return -ENOMEM; - nullb->nr_queues = 0; nullb->queue_depth = nullb->dev->hw_queue_depth; return 0;