| Message ID | 5074CC10.2010103@inktank.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Josh Durgin <josh.durgin@inktank.com> On 10/09/2012 06:14 PM, Alex Elder wrote: > Encapsulate the code that handles updating the size of a mapping > after an rbd image has been refreshed. This is done in anticipation > of the next patch, which will make this common code for format 1 and > 2 images. > > Signed-off-by: Alex Elder <elder@inktank.com> > --- > Changed since v1: > - renamed renamed the function to include "mapping" > - now call the function unconditionally--whether or not > the size has changed, and only update the mapping if > the mapping is to the base image. > > drivers/block/rbd.c | 27 ++++++++++++++++----------- > 1 file changed, 16 insertions(+), 11 deletions(-) > > diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c > index bb3d9be..b64125d 100644 > --- a/drivers/block/rbd.c > +++ b/drivers/block/rbd.c > @@ -1716,6 +1716,19 @@ static void __rbd_remove_all_snaps(struct > rbd_device *rbd_dev) > __rbd_remove_snap_dev(snap); > } > > +static void rbd_update_mapping_size(struct rbd_device *rbd_dev) > +{ > + sector_t size; > + > + if (rbd_dev->mapping.snap_id != CEPH_NOSNAP) > + return; > + > + size = (sector_t) rbd_dev->header.image_size / SECTOR_SIZE; > + dout("setting size to %llu sectors", (unsigned long long) size); > + rbd_dev->mapping.size = (u64) size; > + set_capacity(rbd_dev->disk, size); > +} > + > /* > * only read the first part of the ondisk header, without the snaps info > */ > @@ -1730,17 +1743,9 @@ static int __rbd_refresh_header(struct rbd_device > *rbd_dev, u64 *hver) > > down_write(&rbd_dev->header_rwsem); > > - /* resized? */ > - if (rbd_dev->mapping.snap_id == CEPH_NOSNAP) { > - sector_t size = (sector_t) h.image_size / SECTOR_SIZE; > - > - if (size != (sector_t) rbd_dev->mapping.size) { > - dout("setting size to %llu sectors", > - (unsigned long long) size); > - rbd_dev->mapping.size = (u64) size; > - set_capacity(rbd_dev->disk, size); > - } > - } > + /* Update image size, and check for resize of mapped image */ > + rbd_dev->header.image_size = h.image_size; > + rbd_update_mapping_size(rbd_dev); > > /* rbd_dev->header.object_prefix shouldn't change */ > kfree(rbd_dev->header.snap_sizes); -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index bb3d9be..b64125d 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1716,6 +1716,19 @@ static void __rbd_remove_all_snaps(struct rbd_device *rbd_dev) __rbd_remove_snap_dev(snap); } +static void rbd_update_mapping_size(struct rbd_device *rbd_dev) +{ + sector_t size; + + if (rbd_dev->mapping.snap_id != CEPH_NOSNAP) + return; + + size = (sector_t) rbd_dev->header.image_size / SECTOR_SIZE; + dout("setting size to %llu sectors", (unsigned long long) size); + rbd_dev->mapping.size = (u64) size; + set_capacity(rbd_dev->disk, size); +} + /* * only read the first part of the ondisk header, without the snaps info
Encapsulate the code that handles updating the size of a mapping after an rbd image has been refreshed. This is done in anticipation of the next patch, which will make this common code for format 1 and 2 images. Signed-off-by: Alex Elder <elder@inktank.com> --- Changed since v1: - renamed renamed the function to include "mapping" - now call the function unconditionally--whether or not the size has changed, and only update the mapping if the mapping is to the base image. drivers/block/rbd.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) */ @@ -1730,17 +1743,9 @@ static int __rbd_refresh_header(struct rbd_device *rbd_dev, u64 *hver) down_write(&rbd_dev->header_rwsem); - /* resized? */ - if (rbd_dev->mapping.snap_id == CEPH_NOSNAP) { - sector_t size = (sector_t) h.image_size / SECTOR_SIZE; - - if (size != (sector_t) rbd_dev->mapping.size) { - dout("setting size to %llu sectors", - (unsigned long long) size); - rbd_dev->mapping.size = (u64) size; - set_capacity(rbd_dev->disk, size); - } - } + /* Update image size, and check for resize of mapped image */ + rbd_dev->header.image_size = h.image_size; + rbd_update_mapping_size(rbd_dev); /* rbd_dev->header.object_prefix shouldn't change */ kfree(rbd_dev->header.snap_sizes);