Skip to content

Commit

Permalink
rbd: don't have device release destroy rbd_dev
Browse files Browse the repository at this point in the history
Currently an rbd_device structure gets destroyed from the release
routine for the device embedded within it.  Stop doing that, instead
calling rbd_dev_image_release() right after rbd_bus_del_dev()
wherever the latter is called.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
  • Loading branch information
Alex Elder authored and Sage Weil committed May 2, 2013
1 parent 6fd48b3 commit 8ad42cd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/block/rbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -5011,8 +5011,6 @@ static void rbd_dev_device_release(struct device *dev)
rbd_dev->major = 0;
rbd_dev_id_put(rbd_dev);
rbd_dev_mapping_clear(rbd_dev);

rbd_dev_image_release(rbd_dev);
}

static void rbd_dev_remove_parent(struct rbd_device *rbd_dev)
Expand All @@ -5032,6 +5030,7 @@ static void rbd_dev_remove_parent(struct rbd_device *rbd_dev)
}
rbd_assert(second);
rbd_bus_del_dev(second);
rbd_dev_image_release(second);
first->parent = NULL;
first->parent_overlap = 0;

Expand Down Expand Up @@ -5077,6 +5076,7 @@ static ssize_t rbd_remove(struct bus_type *bus,
goto done;
ret = count;
rbd_bus_del_dev(rbd_dev);
rbd_dev_image_release(rbd_dev);
module_put(THIS_MODULE);
done:
mutex_unlock(&ctl_mutex);
Expand Down

0 comments on commit 8ad42cd

Please sign in to comment.