[PATCH 8/8] Grow: Block reshape when external metadata and write-intent bitmap
From: Jakub Radtke <hidden>
Date: 2021-01-15 13:29:34
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Jakub Radtke <redacted> Current kernel sysfs interface for the bitmap is limited. It allows the applying of the bitmap on non-active volumes only. The reshape operation for a volume with a bitmap should be blocked. Signed-off-by: Jakub Radtke <redacted> Change-Id: I2b4f57d6934815cd63a9cf506328b89fa4aa3930 --- Grow.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/Grow.c b/Grow.c
index 6b8321c5..a48789ce 100644
--- a/Grow.c
+++ b/Grow.c@@ -1838,15 +1838,14 @@ int Grow_reshape(char *devname, int fd, pr_err("Cannot increase raid-disks on this array beyond %d\n", st->max_devs); return 1; } - if (s->level == 0 && - (array.state & (1<<MD_SB_BITMAP_PRESENT)) && - !(array.state & (1<<MD_SB_CLUSTERED))) { - array.state &= ~(1<<MD_SB_BITMAP_PRESENT); - if (md_set_array_info(fd, &array)!= 0) { - pr_err("failed to remove internal bitmap.\n"); - return 1; - } - } + if (s->level == 0 && (array.state & (1 << MD_SB_BITMAP_PRESENT)) && + !(array.state & (1 << MD_SB_CLUSTERED)) && !st->ss->external) { + array.state &= ~(1 << MD_SB_BITMAP_PRESENT); + if (md_set_array_info(fd, &array) != 0) { + pr_err("failed to remove internal bitmap.\n"); + return 1; + } + } /* in the external case we need to check that the requested reshape is * supported, and perform an initial check that the container holds the
@@ -1910,6 +1909,13 @@ int Grow_reshape(char *devname, int fd, free(subarray); return 1; } + if (content->consistency_policy == + CONSISTENCY_POLICY_BITMAP) { + pr_err("Operation not supported when write-intent bitmap is enabled\n"); + sysfs_free(cc); + free(subarray); + return 1; + } } sysfs_free(cc); }
--
2.26.2