Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rbd: do not treat standalone as flatten

Browse source 
If the clone is resized down to 0, it becomes standalone.  If such
resize is carried over while an image is mapped we would detect this
and call rbd_dev_parent_put() which means "let go of all parent state,
including the spec(s) of parent images(s)".  This leads to a mismatch
between "rbd info" and sysfs parent fields, so a fix is in order.

    # rbd create --image-format 2 --size 1 foo
    # rbd snap create foo@snap
    # rbd snap protect foo@snap
    # rbd clone foo@snap bar
    # DEV=$(rbd map bar)
    # rbd resize --allow-shrink --size 0 bar
    # rbd resize --size 1 bar
    # rbd info bar | grep parent
            parent: rbd/foo@snap

Before:

    # cat /sys/bus/rbd/devices/0/parent
    (no parent image)

After:

    # cat /sys/bus/rbd/devices/0/parent
    pool_id 0
    pool_name rbd
    image_id 10056b8b4567
    image_name foo
    snap_id 2
    snap_name snap
    overlap 0

Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Alex Elder <elder@linaro.org>
This commit is contained in:
Ilya Dryomov 2015-01-19 22:57:39 +03:00 committed by Ilya Dryomov
parent bf91c31508
commit cf32bd9c86
1 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/block/rbd.c
View file

@ -4273,32 +4273,22 @@ static int rbd_dev_v2_parent_info(struct rbd_device *rbd_dev)
} }
/* /*
* We always update the parent overlap. If it's zero we * We always update the parent overlap. If it's zero we issue
* treat it specially. * a warning, as we will proceed as if there was no parent.
*/ */
rbd_dev->parent_overlap = overlap;
if (!overlap) { if (!overlap) {
/* A null parent_spec indicates it's the initial probe */
if (parent_spec) { if (parent_spec) {
/* /* refresh, careful to warn just once */
* The overlap has become zero, so the clone if (rbd_dev->parent_overlap)
* must have been resized down to 0 at some rbd_warn(rbd_dev,
* point. Treat this the same as a flatten. "clone now standalone (overlap became 0)");
*/
rbd_dev_parent_put(rbd_dev);
pr_info("%s: clone image now standalone\n",
rbd_dev->disk->disk_name);
} else { } else {
/* /* initial probe */
* For the initial probe, if we find the rbd_warn(rbd_dev, "clone is standalone (overlap 0)");
* overlap is zero we just pretend there was
* no parent image.
*/
rbd_warn(rbd_dev, "ignoring parent with overlap 0");
} }
} }
rbd_dev->parent_overlap = overlap;
out: out:
ret = 0; ret = 0;
out_err: out_err: