diff options
| author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-07-23 17:11:21 +0400 |
|---|---|---|
| committer | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-07-25 13:15:58 +0400 |
| commit | 5ff1108ccc10dbb07bf5875e38fee313844ccef6 (patch) | |
| tree | 13c75f95ec0866903736da74dea2c74eba46fbb8 | |
| parent | 52bb1f9bed796127e8b446b12e5b834026241cdd (diff) | |
| download | op-kernel-dev-5ff1108ccc10dbb07bf5875e38fee313844ccef6.zip op-kernel-dev-5ff1108ccc10dbb07bf5875e38fee313844ccef6.tar.gz | |
rbd: update mapping size only on refresh
There is no sense in trying to update the mapping size before it's even
been set.
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Alex Elder <elder@linaro.org>
| -rw-r--r-- | drivers/block/rbd.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index c4064c5..92a9ce0 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -971,12 +971,6 @@ static int rbd_header_from_disk(struct rbd_device *rbd_dev, header->snap_names = snap_names; header->snap_sizes = snap_sizes; - /* Make sure mapping size is consistent with header info */ - - if (rbd_dev->spec->snap_id == CEPH_NOSNAP || first_time) - if (rbd_dev->mapping.size != header->image_size) - rbd_dev->mapping.size = header->image_size; - return 0; out_2big: ret = -EIO; @@ -3522,9 +3516,14 @@ static int rbd_dev_refresh(struct rbd_device *rbd_dev) if (ret) return ret; - /* If it's a mapped snapshot, validate its EXISTS flag */ + 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; + } else { + /* validate mapped snapshot's EXISTS flag */ + rbd_exists_validate(rbd_dev); + } - rbd_exists_validate(rbd_dev); up_write(&rbd_dev->header_rwsem); if (mapping_size != rbd_dev->mapping.size) { @@ -4507,10 +4506,6 @@ static int rbd_dev_v2_header_info(struct rbd_device *rbd_dev) "is EXPERIMENTAL!"); } - 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; - ret = rbd_dev_v2_snap_context(rbd_dev); dout("rbd_dev_v2_snap_context returned %d\n", ret); |
