lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rbd: kill __rbd_remove()

Browse Source 
The function __rbd_remove() is used in two spots, and it's fairly
simple.  It combines cleanup of part of the ceph-side state as well
as cleaning up the Linux-side state.  Just open code it in the two
callers and eliminate the function.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder
2013-04-26 15:44:36 -05:00
committed by Sage Weil
parent d1cf578845
commit b480815a17
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/block/rbd.c
View File

@@ -4992,12 +4992,6 @@ static void rbd_dev_release(struct device *dev)
module_put(THIS_MODULE); module_put(THIS_MODULE);
} }
static void __rbd_remove(struct rbd_device *rbd_dev)
{
rbd_remove_all_snaps(rbd_dev);
rbd_bus_del_dev(rbd_dev);
}
static void rbd_dev_remove_parent(struct rbd_device *rbd_dev) static void rbd_dev_remove_parent(struct rbd_device *rbd_dev)
{ {
while (rbd_dev->parent_spec) { while (rbd_dev->parent_spec) {
@@ -5013,7 +5007,8 @@ static void rbd_dev_remove_parent(struct rbd_device *rbd_dev)
first = second; first = second;
second = third; second = third;
} }
__rbd_remove(second); rbd_remove_all_snaps(second);
rbd_bus_del_dev(second);
rbd_spec_put(first->parent_spec); rbd_spec_put(first->parent_spec);
first->parent_spec = NULL; first->parent_spec = NULL;
first->parent_overlap = 0; first->parent_overlap = 0;
@@ -5058,8 +5053,8 @@ static ssize_t rbd_remove(struct bus_type *bus,
rbd_dev_remove_parent(rbd_dev); rbd_dev_remove_parent(rbd_dev);
__rbd_remove(rbd_dev); rbd_remove_all_snaps(rbd_dev);
rbd_bus_del_dev(rbd_dev);
done: done:
mutex_unlock(&ctl_mutex); mutex_unlock(&ctl_mutex);