diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2015-10-22 16:44:15 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2015-11-02 23:36:48 +0100 |
| commit | 4afb04c0c88e21f37e5ef4776e432907d7b12838 (patch) | |
| tree | 1608f98ea08ea239840f0fea0739483a6340e0f8 /drivers/block/rbd.c | |
| parent | 6cac4695f2042a1d0e17aa48c5705f69907e74c3 (diff) | |
rbd: remove duplicate calls to rbd_dev_mapping_clear()
Commit d1cf5788450e ("rbd: set mapping info earlier") defined
rbd_dev_mapping_clear(), but, just a few days after, commit
f35a4dee14c3 ("rbd: set the mapping size and features later") moved
rbd_dev_mapping_set() calls and added another rbd_dev_mapping_clear()
call instead of moving the old one. Around the same time, another
duplicate was introduced in rbd_dev_device_release() - kill both.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'drivers/block/rbd.c')
| -rw-r--r-- | drivers/block/rbd.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 6eec200fa3b3..235708c7c46e 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -5254,8 +5254,6 @@ err_out_blkdev: unregister_blkdev(rbd_dev->major, rbd_dev->name); err_out_id: rbd_dev_id_put(rbd_dev); - rbd_dev_mapping_clear(rbd_dev); - return ret; } @@ -5510,7 +5508,6 @@ static void rbd_dev_device_release(struct rbd_device *rbd_dev) if (!single_major) unregister_blkdev(rbd_dev->major, rbd_dev->name); rbd_dev_id_put(rbd_dev); - rbd_dev_mapping_clear(rbd_dev); } static void rbd_dev_remove_parent(struct rbd_device *rbd_dev) |