android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rbd: fix error paths in rbd_dev_refresh()

Browse Source 
header_rwsem should be released on errors.  Also remove useless
rbd_dev->mapping.size != rbd_dev->header.image_size test.

Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
This commit is contained in:
Ilya Dryomov 2015-01-08 20:18:22 +03:00 committed by Ilya Dryomov
parent 982d6011bc
commit 73e39e4dba
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/block/rbd.c
View File

@ -3694,7 +3694,7 @@ static int rbd_dev_refresh(struct rbd_device *rbd_dev)
ret = rbd_dev_header_info(rbd_dev); ret = rbd_dev_header_info(rbd_dev);
if (ret) if (ret)
return ret; goto out;
/* /*
* If there is a parent, see if it has disappeared due to the * If there is a parent, see if it has disappeared due to the
@ -3703,23 +3703,22 @@ static int rbd_dev_refresh(struct rbd_device *rbd_dev)
if (rbd_dev->parent) { if (rbd_dev->parent) {
ret = rbd_dev_v2_parent_info(rbd_dev); ret = rbd_dev_v2_parent_info(rbd_dev);
if (ret) if (ret)
return ret; goto out;
} }
if (rbd_dev->spec->snap_id == CEPH_NOSNAP) { if (rbd_dev->spec->snap_id == CEPH_NOSNAP) {
if (rbd_dev->mapping.size != rbd_dev->header.image_size) rbd_dev->mapping.size = rbd_dev->header.image_size;
rbd_dev->mapping.size = rbd_dev->header.image_size;
} else { } else {
/* validate mapped snapshot's EXISTS flag */ /* validate mapped snapshot's EXISTS flag */
rbd_exists_validate(rbd_dev); rbd_exists_validate(rbd_dev);
} }
out:
up_write(&rbd_dev->header_rwsem); up_write(&rbd_dev->header_rwsem);
if (!ret && mapping_size != rbd_dev->mapping.size)
if (mapping_size != rbd_dev->mapping.size)
rbd_dev_update_size(rbd_dev); rbd_dev_update_size(rbd_dev);
return 0; return ret;
} }
static int rbd_init_disk(struct rbd_device *rbd_dev) static int rbd_init_disk(struct rbd_device *rbd_dev)