evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rbd: move locking out of rbd_header_set_snap()

Browse source 
Move the calls to get the header semaphore out of
rbd_header_set_snap() and into its caller.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder 2012-08-23 23:48:49 -05:00
parent 1fcdb8aa1f
commit 4bb1f1ed00
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/block/rbd.c
View file

@ -647,8 +647,6 @@ static int rbd_header_set_snap(struct rbd_device *rbd_dev, char *snap_name)
{ {
int ret; int ret;
down_write(&rbd_dev->header_rwsem);
if (!memcmp(snap_name, RBD_SNAP_HEAD_NAME, if (!memcmp(snap_name, RBD_SNAP_HEAD_NAME,
sizeof (RBD_SNAP_HEAD_NAME))) { sizeof (RBD_SNAP_HEAD_NAME))) {
rbd_dev->mapping.snap_id = CEPH_NOSNAP; rbd_dev->mapping.snap_id = CEPH_NOSNAP;
@ -666,7 +664,6 @@ static int rbd_header_set_snap(struct rbd_device *rbd_dev, char *snap_name)
ret = 0; ret = 0;
done: done:
up_write(&rbd_dev->header_rwsem);
return ret; return ret;
} }
@ -2608,7 +2605,9 @@ static ssize_t rbd_add(struct bus_type *bus,
if (rc) if (rc)
goto err_out_bus; goto err_out_bus;
down_write(&rbd_dev->header_rwsem);
rc = rbd_header_set_snap(rbd_dev, snap_name); rc = rbd_header_set_snap(rbd_dev, snap_name);
up_write(&rbd_dev->header_rwsem);
if (rc) if (rc)
goto err_out_bus; goto err_out_bus;