cdf21d08ef
After updating to latest upstream, bug2163711 can be fixed. We don't use rhel only udev rule anymore and we use the udev rules from upstream. So we don't need to modify our rhel only udev rule again. Resolves: bz#2163711 Signed-off-by: Xiao Ni <xni@redhat.com>
232 lines
6.6 KiB
Diff
232 lines
6.6 KiB
Diff
From 7211116c295ba1f9e1fcbdc2dd2d3762855062e1 Mon Sep 17 00:00:00 2001
|
|
From: Mateusz Kusiak <mateusz.kusiak@intel.com>
|
|
Date: Thu, 28 Jul 2022 20:20:53 +0800
|
|
Subject: [PATCH 51/83] Grow: Split Grow_reshape into helper function
|
|
|
|
Grow_reshape should be split into helper functions given its size.
|
|
- Add helper function for preparing reshape on external metadata.
|
|
- Close cfd file descriptor.
|
|
|
|
Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>
|
|
Acked-by: Coly Li <colyli@suse.de>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
---
|
|
Grow.c | 125 ++++++++++++++++++++++++++++++--------------------------
|
|
mdadm.h | 1 +
|
|
util.c | 14 +++++++
|
|
3 files changed, 81 insertions(+), 59 deletions(-)
|
|
|
|
diff --git a/Grow.c b/Grow.c
|
|
index 868bdc3a..0f07a894 100644
|
|
--- a/Grow.c
|
|
+++ b/Grow.c
|
|
@@ -1773,6 +1773,65 @@ static int reshape_container(char *container, char *devname,
|
|
char *backup_file, int verbose,
|
|
int forked, int restart, int freeze_reshape);
|
|
|
|
+/**
|
|
+ * prepare_external_reshape() - prepares update on external metadata if supported.
|
|
+ * @devname: Device name.
|
|
+ * @subarray: Subarray.
|
|
+ * @st: Supertype.
|
|
+ * @container: Container.
|
|
+ * @cfd: Container file descriptor.
|
|
+ *
|
|
+ * Function checks that the requested reshape is supported on external metadata,
|
|
+ * and performs an initial check that the container holds the pre-requisite
|
|
+ * spare devices (mdmon owns final validation).
|
|
+ *
|
|
+ * Return: 0 on success, else 1
|
|
+ */
|
|
+static int prepare_external_reshape(char *devname, char *subarray,
|
|
+ struct supertype *st, char *container,
|
|
+ const int cfd)
|
|
+{
|
|
+ struct mdinfo *cc = NULL;
|
|
+ struct mdinfo *content = NULL;
|
|
+
|
|
+ if (st->ss->load_container(st, cfd, NULL)) {
|
|
+ pr_err("Cannot read superblock for %s\n", devname);
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
+ if (!st->ss->container_content)
|
|
+ return 1;
|
|
+
|
|
+ cc = st->ss->container_content(st, subarray);
|
|
+ for (content = cc; content ; content = content->next) {
|
|
+ /*
|
|
+ * check if reshape is allowed based on metadata
|
|
+ * indications stored in content.array.status
|
|
+ */
|
|
+ if (is_bit_set(&content->array.state, MD_SB_BLOCK_VOLUME) ||
|
|
+ is_bit_set(&content->array.state, MD_SB_BLOCK_CONTAINER_RESHAPE)) {
|
|
+ pr_err("Cannot reshape arrays in container with unsupported metadata: %s(%s)\n",
|
|
+ devname, container);
|
|
+ goto error;
|
|
+ }
|
|
+ if (content->consistency_policy == CONSISTENCY_POLICY_PPL) {
|
|
+ pr_err("Operation not supported when ppl consistency policy is enabled\n");
|
|
+ goto error;
|
|
+ }
|
|
+ if (content->consistency_policy == CONSISTENCY_POLICY_BITMAP) {
|
|
+ pr_err("Operation not supported when write-intent bitmap consistency policy is enabled\n");
|
|
+ goto error;
|
|
+ }
|
|
+ }
|
|
+ sysfs_free(cc);
|
|
+ if (mdmon_running(container))
|
|
+ st->update_tail = &st->updates;
|
|
+ return 0;
|
|
+error:
|
|
+ sysfs_free(cc);
|
|
+ return 1;
|
|
+}
|
|
+
|
|
int Grow_reshape(char *devname, int fd,
|
|
struct mddev_dev *devlist,
|
|
struct context *c, struct shape *s)
|
|
@@ -1799,7 +1858,7 @@ int Grow_reshape(char *devname, int fd,
|
|
struct supertype *st;
|
|
char *subarray = NULL;
|
|
|
|
- int frozen;
|
|
+ int frozen = 0;
|
|
int changed = 0;
|
|
char *container = NULL;
|
|
int cfd = -1;
|
|
@@ -1808,7 +1867,7 @@ int Grow_reshape(char *devname, int fd,
|
|
int added_disks;
|
|
|
|
struct mdinfo info;
|
|
- struct mdinfo *sra;
|
|
+ struct mdinfo *sra = NULL;
|
|
|
|
if (md_get_array_info(fd, &array) < 0) {
|
|
pr_err("%s is not an active md array - aborting\n",
|
|
@@ -1865,13 +1924,7 @@ int Grow_reshape(char *devname, int fd,
|
|
}
|
|
}
|
|
|
|
- /* in the external case we need to check that the requested reshape is
|
|
- * supported, and perform an initial check that the container holds the
|
|
- * pre-requisite spare devices (mdmon owns final validation)
|
|
- */
|
|
if (st->ss->external) {
|
|
- int retval;
|
|
-
|
|
if (subarray) {
|
|
container = st->container_devnm;
|
|
cfd = open_dev_excl(st->container_devnm);
|
|
@@ -1887,13 +1940,12 @@ int Grow_reshape(char *devname, int fd,
|
|
return 1;
|
|
}
|
|
|
|
- retval = st->ss->load_container(st, cfd, NULL);
|
|
-
|
|
- if (retval) {
|
|
- pr_err("Cannot read superblock for %s\n", devname);
|
|
- close(cfd);
|
|
+ rv = prepare_external_reshape(devname, subarray, st,
|
|
+ container, cfd);
|
|
+ if (rv > 0) {
|
|
free(subarray);
|
|
- return 1;
|
|
+ close(cfd);
|
|
+ goto release;
|
|
}
|
|
|
|
if (s->raiddisks && subarray) {
|
|
@@ -1902,51 +1954,6 @@ int Grow_reshape(char *devname, int fd,
|
|
free(subarray);
|
|
return 1;
|
|
}
|
|
-
|
|
- /* check if operation is supported for metadata handler */
|
|
- if (st->ss->container_content) {
|
|
- struct mdinfo *cc = NULL;
|
|
- struct mdinfo *content = NULL;
|
|
-
|
|
- cc = st->ss->container_content(st, subarray);
|
|
- for (content = cc; content ; content = content->next) {
|
|
- int allow_reshape = 1;
|
|
-
|
|
- /* check if reshape is allowed based on metadata
|
|
- * indications stored in content.array.status
|
|
- */
|
|
- if (content->array.state &
|
|
- (1 << MD_SB_BLOCK_VOLUME))
|
|
- allow_reshape = 0;
|
|
- if (content->array.state &
|
|
- (1 << MD_SB_BLOCK_CONTAINER_RESHAPE))
|
|
- allow_reshape = 0;
|
|
- if (!allow_reshape) {
|
|
- pr_err("cannot reshape arrays in container with unsupported metadata: %s(%s)\n",
|
|
- devname, container);
|
|
- sysfs_free(cc);
|
|
- free(subarray);
|
|
- return 1;
|
|
- }
|
|
- if (content->consistency_policy ==
|
|
- CONSISTENCY_POLICY_PPL) {
|
|
- pr_err("Operation not supported when ppl consistency policy is enabled\n");
|
|
- sysfs_free(cc);
|
|
- 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);
|
|
- }
|
|
- if (mdmon_running(container))
|
|
- st->update_tail = &st->updates;
|
|
}
|
|
|
|
added_disks = 0;
|
|
diff --git a/mdadm.h b/mdadm.h
|
|
index 8208b81e..941a5f38 100644
|
|
--- a/mdadm.h
|
|
+++ b/mdadm.h
|
|
@@ -1539,6 +1539,7 @@ extern int stat_is_blkdev(char *devname, dev_t *rdev);
|
|
extern bool is_dev_alive(char *path);
|
|
extern int get_mdp_major(void);
|
|
extern int get_maj_min(char *dev, int *major, int *minor);
|
|
+extern bool is_bit_set(int *val, unsigned char index);
|
|
extern int dev_open(char *dev, int flags);
|
|
extern int open_dev(char *devnm);
|
|
extern void reopen_mddev(int mdfd);
|
|
diff --git a/util.c b/util.c
|
|
index ca48d976..26ffdcea 100644
|
|
--- a/util.c
|
|
+++ b/util.c
|
|
@@ -1027,6 +1027,20 @@ int get_maj_min(char *dev, int *major, int *minor)
|
|
*e == 0);
|
|
}
|
|
|
|
+/**
|
|
+ * is_bit_set() - get bit value by index.
|
|
+ * @val: value.
|
|
+ * @index: index of the bit (LSB numbering).
|
|
+ *
|
|
+ * Return: bit value.
|
|
+ */
|
|
+bool is_bit_set(int *val, unsigned char index)
|
|
+{
|
|
+ if ((*val) & (1 << index))
|
|
+ return true;
|
|
+ return false;
|
|
+}
|
|
+
|
|
int dev_open(char *dev, int flags)
|
|
{
|
|
/* like 'open', but if 'dev' matches %d:%d, create a temp
|
|
--
|
|
2.38.1
|
|
|