rbd: only reset capacity when pointing to head
authorJosh Durgin <josh.durgin@inktank.com>
Tue, 22 Nov 2011 01:13:54 +0000 (17:13 -0800)
committerSage Weil <sage@inktank.com>
Tue, 31 Jul 2012 01:15:37 +0000 (18:15 -0700)
Snapshots cannot be resized, and the new capacity of head should not
be reflected by the snapshot.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>
drivers/block/rbd.c

index 730d0ce505e1c4210eca3e198e602bff911a8422..f171cebabda9285aae84dddee25daf89e55c71ec 100644 (file)
@@ -1725,7 +1725,12 @@ static int __rbd_refresh_header(struct rbd_device *rbd_dev)
                return ret;
 
        /* resized? */
-       set_capacity(rbd_dev->disk, h.image_size / SECTOR_SIZE);
+       if (rbd_dev->snap_id == CEPH_NOSNAP) {
+               sector_t size = (sector_t) h.image_size / SECTOR_SIZE;
+
+               dout("setting size to %llu sectors", (unsigned long long) size);
+               set_capacity(rbd_dev->disk, size);
+       }
 
        down_write(&rbd_dev->header_rwsem);