From: Jes Sorensen <jsorensen@fb.com>
Date: Tue, 25 Apr 2017 15:40:27 +0000 (-0400)
Subject: Detail: determine array state from sysfs
X-Git-Tag: mdadm-4.1-rc1~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4dcdb23ea639d14e92d1c86336de7ad505b2f7d;p=thirdparty%2Fmdadm.git

Detail: determine array state from sysfs

This is easily obtained from sysfs as part of the existing call to
sysfs_read() and it simplifies the code a little too.

Another small step in the process of getting rid of the GET_ARRAY_STATE
ioctl.

Signed-off-by: Jes Sorensen <jsorensen@fb.com>
---

diff --git a/Detail.c b/Detail.c
index 91c5a984..eb692761 100644
--- a/Detail.c
+++ b/Detail.c
@@ -86,7 +86,7 @@ int Detail(char *dev, struct context *c)
 			dev, strerror(errno));
 		return rv;
 	}
-	sra = sysfs_read(fd, NULL, GET_VERSION|GET_DEVS);
+	sra = sysfs_read(fd, NULL, GET_VERSION | GET_DEVS | GET_ARRAY_STATE);
 	if (!sra) {
 		pr_err("%s does not appear to be an md device\n", dev);
 		close(fd);
@@ -94,10 +94,10 @@ int Detail(char *dev, struct context *c)
 	}
 	external = (sra != NULL && sra->array.major_version == -1 &&
 		    sra->array.minor_version == -2);
+	inactive = (sra->array_state == ARRAY_ACTIVE ||
+		    sra->array_state == ARRAY_CLEAR);
 	st = super_by_fd(fd, &subarray);
-	if (md_get_array_info(fd, &array) == 0) {
-		inactive = 0;
-	} else if (errno == ENODEV && sra) {
+	if (md_get_array_info(fd, &array) && errno == ENODEV) {
 		if (sra->array.major_version == -1 &&
 		    sra->array.minor_version == -1 &&
 		    sra->devs == NULL) {
@@ -107,7 +107,6 @@ int Detail(char *dev, struct context *c)
 			return rv;
 		}
 		array = sra->array;
-		inactive = 1;
 	} else {
 		pr_err("cannot get array detail for %s: %s\n",
 		       dev, strerror(errno));