X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=sysfs.c;h=48d1f54264818097c22ba8322d03e4703e2c19dd;hp=58c84e26339e8014027bcea6d722bf87b73b4030;hb=506ffd1e0bd08cc74f5177d4f4db7c66d7724f6a;hpb=492350045c7e40741069caa7d017209439db665b

diff --git a/sysfs.c b/sysfs.c
index 58c84e26..48d1f542 100644
--- a/sysfs.c
+++ b/sysfs.c
@@ -81,27 +81,23 @@ int sysfs_open(int devnum, char *devname, char *attr)
 
 void sysfs_init(struct mdinfo *mdi, int fd, int devnum)
 {
+	mdi->sys_name[0] = 0;
 	if (fd >= 0) {
-		struct stat stb;
 		mdu_version_t vers;
- 		if (fstat(fd, &stb))
-			return;
 		if (ioctl(fd, RAID_VERSION, &vers) != 0)
 			return;
-		if (major(stb.st_rdev)==9)
-			sprintf(mdi->sys_name, "md%d", (int)minor(stb.st_rdev));
-		else
-			sprintf(mdi->sys_name, "md_d%d",
-				(int)minor(stb.st_rdev)>>MdpMinorShift);
-	} else {
-		if (devnum >= 0)
-			sprintf(mdi->sys_name, "md%d", devnum);
-		else
-			sprintf(mdi->sys_name, "md_d%d",
-				-1-devnum);
+		devnum = fd2devnum(fd);
 	}
+	if (devnum == NoMdDev)
+		return;
+	if (devnum >= 0)
+		sprintf(mdi->sys_name, "md%d", devnum);
+	else
+		sprintf(mdi->sys_name, "md_d%d",
+			-1-devnum);
 }
 
+
 struct mdinfo *sysfs_read(int fd, int devnum, unsigned long options)
 {
 	/* Longest possible name in sysfs, mounted at /sys, is
@@ -123,6 +119,10 @@ struct mdinfo *sysfs_read(int fd, int devnum, unsigned long options)
 		return sra;
 	memset(sra, 0, sizeof(*sra));
 	sysfs_init(sra, fd, devnum);
+	if (sra->sys_name[0] == 0) {
+		free(sra);
+		return NULL;
+	}
 
 	sprintf(fname, "/sys/block/%s/md/", sra->sys_name);
 	base = fname + strlen(fname);
@@ -272,18 +272,34 @@ struct mdinfo *sysfs_read(int fd, int devnum, unsigned long options)
 			}
 			
 		}
-		dev->next = sra->devs;
-		sra->devs = dev;
-
 		strcpy(dev->sys_name, de->d_name);
 		dev->disk.raid_disk = strtoul(buf, &ep, 10);
 		if (*ep) dev->disk.raid_disk = -1;
 
 		strcpy(dbase, "block/dev");
-		if (load_sys(fname, buf))
-			goto abort;
+		if (load_sys(fname, buf)) {
+			free(dev);
+			if (options & SKIP_GONE_DEVS)
+				continue;
+			else
+				goto abort;
+		}
 		sscanf(buf, "%d:%d", &dev->disk.major, &dev->disk.minor);
 
+		/* special case check for block devices that can go 'offline' */
+		if (options & SKIP_GONE_DEVS) {
+			strcpy(dbase, "block/device/state");
+			if (load_sys(fname, buf) == 0 &&
+			    strncmp(buf, "offline", 7) == 0) {
+				free(dev);
+				continue;
+			}
+		}
+
+		/* finally add this disk to the array */
+		dev->next = sra->devs;
+		sra->devs = dev;
+
 		if (options & GET_OFFSET) {
 			strcpy(dbase, "offset");
 			if (load_sys(fname, buf))
@@ -363,7 +379,7 @@ unsigned long long get_component_size(int fd)
 	char fname[50];
 	int n;
 	if (fstat(fd, &stb)) return 0;
-	if (major(stb.st_rdev) == 9)
+	if (major(stb.st_rdev) != get_mdp_major())
 		sprintf(fname, "/sys/block/md%d/md/component_size",
 			(int)minor(stb.st_rdev));
 	else
@@ -410,6 +426,22 @@ int sysfs_set_num(struct mdinfo *sra, struct mdinfo *dev,
 	return sysfs_set_str(sra, dev, name, valstr);
 }
 
+int sysfs_uevent(struct mdinfo *sra, char *event)
+{
+	char fname[50];
+	int n;
+	int fd;
+
+	sprintf(fname, "/sys/block/%s/uevent",
+		sra->sys_name);
+	fd = open(fname, O_WRONLY);
+	if (fd < 0)
+		return -1;
+	n = write(fd, event, strlen(event));
+	close(fd);
+	return 0;
+}	
+
 int sysfs_get_ll(struct mdinfo *sra, struct mdinfo *dev,
 		       char *name, unsigned long long *val)
 {
@@ -474,6 +506,20 @@ int sysfs_set_array(struct mdinfo *info, int vers)
 	rv |= sysfs_set_num(info, NULL, "chunk_size", info->array.chunk_size);
 	rv |= sysfs_set_num(info, NULL, "layout", info->array.layout);
 	rv |= sysfs_set_num(info, NULL, "component_size", info->component_size/2);
+	if (info->custom_array_size) {
+		int rc;
+
+		rc = sysfs_set_num(info, NULL, "array_size",
+				   info->custom_array_size/2);
+		if (rc && errno == ENOENT) {
+			fprintf(stderr, Name ": This kernel does not "
+				"have the md/array_size attribute, "
+				"the array may be larger than expected\n");
+			rc = 0;
+		}
+		rv |= rc;
+	}
+
 	if (info->array.level > 0)
 		rv |= sysfs_set_num(info, NULL, "resync_start", info->resync_start);
 	return rv;