diff options
| author |   Ilya Dryomov <idryomov@redhat.com> | 2015-01-08 20:18:22 +0300 |
|---|---|---|
| committer |   Ilya Dryomov <idryomov@gmail.com> | 2015-02-19 13:31:38 +0300 |
| commit | 73e39e4dba828fe1affefe6290456623319707bd (patch) | |
| tree | 436c5f303096c5c7ce9417b52259da129fe83674 /drivers | |
| parent | ceph: improve reference tracking for snaprealm (diff) | |
| download | linux-dev-73e39e4dba828fe1affefe6290456623319707bd.tar.xz linux-dev-73e39e4dba828fe1affefe6290456623319707bd.zip | |
rbd: fix error paths in rbd_dev_refresh()
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/rbd.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index ef070d7c5e3c..b85d52005a21 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3694,7 +3694,7 @@ static int rbd_dev_refresh(struct rbd_device *rbd_dev) ret = rbd_dev_header_info(rbd_dev); if (ret) - return ret; + goto out; /* * 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) { ret = rbd_dev_v2_parent_info(rbd_dev); if (ret) - return ret; + goto out; } 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 { /* validate mapped snapshot's EXISTS flag */ rbd_exists_validate(rbd_dev); } +out: up_write(&rbd_dev->header_rwsem); - - if (mapping_size != rbd_dev->mapping.size) + if (!ret && mapping_size != rbd_dev->mapping.size) rbd_dev_update_size(rbd_dev); - return 0; + return ret; } static int rbd_init_disk(struct rbd_device *rbd_dev) |