|
 |
2c1b57 |
From 9db2ab4e9b1ad79b9364b6e03bdd675716a688a5 Mon Sep 17 00:00:00 2001
|
|
|
2c1b57 |
From: Jes Sorensen <jsorensen@fb.com>
|
|
|
2c1b57 |
Date: Wed, 3 May 2017 14:25:57 -0400
|
|
|
2c1b57 |
Subject: [RHEL7.5 PATCH 106/169] util: md_array_valid(): Introduce
|
|
|
2c1b57 |
md_array_valid() helper
|
|
|
2c1b57 |
|
|
|
2c1b57 |
Using md_get_array_info() to determine if an array is valid is broken
|
|
|
2c1b57 |
during creation, since the ioctl() returns -ENODEV if the device is
|
|
|
2c1b57 |
valid but not active.
|
|
|
2c1b57 |
|
|
|
2c1b57 |
Where did I leave my stash of brown paper bags?
|
|
|
2c1b57 |
|
|
|
2c1b57 |
Fixes: ("40b054e mdopen/open_mddev: Use md_get_array_info() to determine valid array")
|
|
|
2c1b57 |
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
|
2c1b57 |
---
|
|
|
2c1b57 |
mdadm.h | 1 +
|
|
|
2c1b57 |
mdopen.c | 3 +--
|
|
|
2c1b57 |
util.c | 24 ++++++++++++++++++++++++
|
|
|
2c1b57 |
3 files changed, 26 insertions(+), 2 deletions(-)
|
|
|
2c1b57 |
|
|
|
2c1b57 |
diff --git a/mdadm.h b/mdadm.h
|
|
|
2c1b57 |
index 6a382a7..07ee963 100644
|
|
|
2c1b57 |
--- a/mdadm.h
|
|
|
2c1b57 |
+++ b/mdadm.h
|
|
|
2c1b57 |
@@ -1415,6 +1415,7 @@ extern int Dump_metadata(char *dev, char *dir, struct context *c,
|
|
|
2c1b57 |
extern int Restore_metadata(char *dev, char *dir, struct context *c,
|
|
|
2c1b57 |
struct supertype *st, int only);
|
|
|
2c1b57 |
|
|
|
2c1b57 |
+int md_array_valid(int fd);
|
|
|
2c1b57 |
int md_array_active(int fd);
|
|
|
2c1b57 |
int md_get_array_info(int fd, struct mdu_array_info_s *array);
|
|
|
2c1b57 |
int md_set_array_info(int fd, struct mdu_array_info_s *array);
|
|
|
2c1b57 |
diff --git a/mdopen.c b/mdopen.c
|
|
|
2c1b57 |
index 099efa0..c4f1c12 100644
|
|
|
2c1b57 |
--- a/mdopen.c
|
|
|
2c1b57 |
+++ b/mdopen.c
|
|
|
2c1b57 |
@@ -442,7 +442,6 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
|
|
|
2c1b57 |
*/
|
|
|
2c1b57 |
int open_mddev(char *dev, int report_errors)
|
|
|
2c1b57 |
{
|
|
|
2c1b57 |
- struct mdu_array_info_s array;
|
|
|
2c1b57 |
int mdfd = open(dev, O_RDONLY);
|
|
|
2c1b57 |
|
|
|
2c1b57 |
if (mdfd < 0) {
|
|
|
2c1b57 |
@@ -452,7 +451,7 @@ int open_mddev(char *dev, int report_errors)
|
|
|
2c1b57 |
return -1;
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
|
|
|
2c1b57 |
- if (md_get_array_info(mdfd, &array) != 0) {
|
|
|
2c1b57 |
+ if (md_array_valid(mdfd) == 0) {
|
|
|
2c1b57 |
close(mdfd);
|
|
|
2c1b57 |
if (report_errors)
|
|
|
2c1b57 |
pr_err("%s does not appear to be an md device\n", dev);
|
|
|
2c1b57 |
diff --git a/util.c b/util.c
|
|
|
2c1b57 |
index 21a63c9..c7585ac 100644
|
|
|
2c1b57 |
--- a/util.c
|
|
|
2c1b57 |
+++ b/util.c
|
|
|
2c1b57 |
@@ -200,6 +200,30 @@ out:
|
|
|
2c1b57 |
return ret;
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
|
|
|
2c1b57 |
+int md_array_valid(int fd)
|
|
|
2c1b57 |
+{
|
|
|
2c1b57 |
+ struct mdinfo *sra;
|
|
|
2c1b57 |
+ int ret;
|
|
|
2c1b57 |
+
|
|
|
2c1b57 |
+ sra = sysfs_read(fd, NULL, GET_ARRAY_STATE);
|
|
|
2c1b57 |
+ if (sra) {
|
|
|
2c1b57 |
+ if (sra->array_state != ARRAY_UNKNOWN_STATE)
|
|
|
2c1b57 |
+ ret = 0;
|
|
|
2c1b57 |
+ else
|
|
|
2c1b57 |
+ ret = -ENODEV;
|
|
|
2c1b57 |
+
|
|
|
2c1b57 |
+ free(sra);
|
|
|
2c1b57 |
+ } else {
|
|
|
2c1b57 |
+ /*
|
|
|
2c1b57 |
+ * GET_ARRAY_INFO doesn't provide access to the proper state
|
|
|
2c1b57 |
+ * information, so fallback to a basic check for raid_disks != 0
|
|
|
2c1b57 |
+ */
|
|
|
2c1b57 |
+ ret = ioctl(fd, RAID_VERSION);
|
|
|
2c1b57 |
+ }
|
|
|
2c1b57 |
+
|
|
|
2c1b57 |
+ return !ret;
|
|
|
2c1b57 |
+}
|
|
|
2c1b57 |
+
|
|
|
2c1b57 |
int md_array_active(int fd)
|
|
|
2c1b57 |
{
|
|
|
2c1b57 |
struct mdinfo *sra;
|
|
|
2c1b57 |
--
|
|
|
2c1b57 |
2.7.4
|
|
|
2c1b57 |
|