mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
rbd: remove duplicate calls to rbd_dev_mapping_clear()
Commitd1cf578845
("rbd: set mapping info earlier") defined rbd_dev_mapping_clear(), but, just a few days after, commitf35a4dee14
("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>
This commit is contained in:
parent
6cac4695f2
commit
4afb04c0c8
1 changed files with 0 additions and 3 deletions
|
@ -5254,8 +5254,6 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev)
|
||||||
unregister_blkdev(rbd_dev->major, rbd_dev->name);
|
unregister_blkdev(rbd_dev->major, rbd_dev->name);
|
||||||
err_out_id:
|
err_out_id:
|
||||||
rbd_dev_id_put(rbd_dev);
|
rbd_dev_id_put(rbd_dev);
|
||||||
rbd_dev_mapping_clear(rbd_dev);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5510,7 +5508,6 @@ static void rbd_dev_device_release(struct rbd_device *rbd_dev)
|
||||||
if (!single_major)
|
if (!single_major)
|
||||||
unregister_blkdev(rbd_dev->major, rbd_dev->name);
|
unregister_blkdev(rbd_dev->major, rbd_dev->name);
|
||||||
rbd_dev_id_put(rbd_dev);
|
rbd_dev_id_put(rbd_dev);
|
||||||
rbd_dev_mapping_clear(rbd_dev);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void rbd_dev_remove_parent(struct rbd_device *rbd_dev)
|
static void rbd_dev_remove_parent(struct rbd_device *rbd_dev)
|
||||||
|
|
Loading…
Reference in a new issue