diff options
| author |   Ilya Dryomov <idryomov@gmail.com> | 2017-05-23 17:49:54 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@fb.com> | 2017-05-30 08:15:07 -0600 |
| commit | af622b86665881ffa96bc77fb89c94fae02cfa6b (patch) | |
| tree | efce28ae8a62183077aedbfa7996e4a103e6068d /drivers | |
| parent | Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-linus (diff) | |
| download | linux-dev-af622b86665881ffa96bc77fb89c94fae02cfa6b.tar.xz linux-dev-af622b86665881ffa96bc77fb89c94fae02cfa6b.zip | |
nbd: nbd_reset() call in nbd_dev_add() is redundant
There is nothing to clear -- nbd_device has just been allocated.
Fold nbd_reset() into its other caller, nbd_config_put().
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/nbd.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 9a7bb2c29447..e725d8d5ab0b 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -937,14 +937,6 @@ static int nbd_reconnect_socket(struct nbd_device *nbd, unsigned long arg) return -ENOSPC; } -/* Reset all properties of an NBD device */ -static void nbd_reset(struct nbd_device *nbd) -{ - nbd->config = NULL; - nbd->tag_set.timeout = 0; - queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, nbd->disk->queue); -} - static void nbd_bdev_reset(struct block_device *bdev) { if (bdev->bd_openers > 1) @@ -1029,7 +1021,10 @@ static void nbd_config_put(struct nbd_device *nbd) } kfree(config->socks); } - nbd_reset(nbd); + nbd->config = NULL; + + nbd->tag_set.timeout = 0; + queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, nbd->disk->queue); mutex_unlock(&nbd->config_lock); nbd_put(nbd); @@ -1483,7 +1478,6 @@ static int nbd_dev_add(int index) disk->fops = &nbd_fops; disk->private_data = nbd; sprintf(disk->disk_name, "nbd%d", index); - nbd_reset(nbd); add_disk(disk); nbd_total_devices++; return index; |