lkml.org 
[lkml]   [2013]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 134/171] rbd: only reset capacity when pointing to head
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------


    From: Josh Durgin <josh.durgin@inktank.com>

    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>
    (cherry picked from commit 474ef7ce832d471148f63a9d07f67fc5564834f1)
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/block/rbd.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    --- a/drivers/block/rbd.c
    +++ b/drivers/block/rbd.c
    @@ -1721,7 +1721,12 @@ static int __rbd_update_snaps(struct rbd
    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);




    \
     
     \ /
      Last update: 2013-01-16 00:41    [W:4.037 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site