Commit b053bb55 authored by John Snow's avatar John Snow
Browse files

block/dirty-bitmaps: prohibit enable/disable on locked/frozen bitmaps 



We're not being consistent about this. If it's in use by an operation,
the user should not be able to change the behavior of that bitmap.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20181002230218.13949-5-jsnow@redhat.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 0be37c9e

blockdev.c

+20 −6
Original line number Diff line number Diff line
@@ -2059,6 +2059,13 @@ static void block_dirty_bitmap_enable_prepare(BlkActionState *common, 
        return;

    }



    if (bdrv_dirty_bitmap_user_locked(state->bitmap)) {

        error_setg(errp,

                   "Bitmap '%s' is currently in use by another operation"

                   " and cannot be enabled", action->name);

        return;

    }



    state->was_enabled = bdrv_dirty_bitmap_enabled(state->bitmap);

    bdrv_enable_dirty_bitmap(state->bitmap);

}
@@ -2093,6 +2100,13 @@ static void block_dirty_bitmap_disable_prepare(BlkActionState *common, 
        return;

    }



    if (bdrv_dirty_bitmap_user_locked(state->bitmap)) {

        error_setg(errp,

                   "Bitmap '%s' is currently in use by another operation"

                   " and cannot be disabled", action->name);

        return;

    }



    state->was_enabled = bdrv_dirty_bitmap_enabled(state->bitmap);

    bdrv_disable_dirty_bitmap(state->bitmap);

}
@@ -2934,10 +2948,10 @@ void qmp_x_block_dirty_bitmap_enable(const char *node, const char *name, 
        return;

    }



    if (bdrv_dirty_bitmap_frozen(bitmap)) {

    if (bdrv_dirty_bitmap_user_locked(bitmap)) {

        error_setg(errp,

                   "Bitmap '%s' is currently frozen and cannot be enabled",

                   name);

                   "Bitmap '%s' is currently in use by another operation"

                   " and cannot be enabled", name);

        return;

    }
@@ -2955,10 +2969,10 @@ void qmp_x_block_dirty_bitmap_disable(const char *node, const char *name, 
        return;

    }



    if (bdrv_dirty_bitmap_frozen(bitmap)) {

    if (bdrv_dirty_bitmap_user_locked(bitmap)) {

        error_setg(errp,

                   "Bitmap '%s' is currently frozen and cannot be disabled",

                   name);

                   "Bitmap '%s' is currently in use by another operation"

                   " and cannot be disabled", name);

        return;

    }