From: NeilBrown <neilb@suse.de>
Date: Wed, 19 Jun 2013 00:33:47 +0000 (+1000)
Subject: sysfs_read: return devices in same order as in filesystem.
X-Git-Tag: mdadm-3.3-rc1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64e103fe19c84b9ec828a833c1def500d1b70c67;p=thirdparty%2Fmdadm.git

sysfs_read: return devices in same order as in filesystem.

When we read devices from sysfs (../md/dev-*), store them in the same
order that they appear.  That makes more sense when exposed to a
human (as the next patch will).

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/sysfs.c b/sysfs.c
index 6bc28651..cb25a413 100644
--- a/sysfs.c
+++ b/sysfs.c
@@ -96,7 +96,7 @@ struct mdinfo *sysfs_read(int fd, char *devnm, unsigned long options)
 	char *base;
 	char *dbase;
 	struct mdinfo *sra;
-	struct mdinfo *dev;
+	struct mdinfo *dev, **devp;
 	DIR *dir = NULL;
 	struct dirent *de;
 
@@ -235,6 +235,8 @@ struct mdinfo *sysfs_read(int fd, char *devnm, unsigned long options)
 		goto abort;
 	sra->array.spare_disks = 0;
 
+	devp = &sra->devs;
+	sra->devs = NULL;
 	while ((de = readdir(dir)) != NULL) {
 		char *ep;
 		if (de->d_ino == 0 ||
@@ -266,7 +268,7 @@ struct mdinfo *sysfs_read(int fd, char *devnm, unsigned long options)
 				free(dev);
 				goto abort;
 			}
-			
+
 		}
 		strcpy(dev->sys_name, de->d_name);
 		dev->disk.raid_disk = strtoul(buf, &ep, 10);
@@ -292,8 +294,9 @@ struct mdinfo *sysfs_read(int fd, char *devnm, unsigned long options)
 		}
 
 		/* finally add this disk to the array */
-		dev->next = sra->devs;
-		sra->devs = dev;
+		*devp = dev;
+		devp = & dev->next;
+		dev->next = NULL;
 
 		if (options & GET_OFFSET) {
 			strcpy(dbase, "offset");