cluster: RHEL5 - qdisk: propagate parent_holder information to childs

cluster: RHEL5 - qdisk: propagate parent_holder information to childs

[Lon Hohberger]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4b0686b390a0a9dbc1afe19dd7db3a6fe3e7303a
Commit:        4b0686b390a0a9dbc1afe19dd7db3a6fe3e7303a
Parent:        ba4a7fb8e69deff35d8f993bec9f273957eb3305
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Wed Feb 11 10:54:05 2009 +0100
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Thu Feb 12 14:23:45 2009 -0500

qdisk: propagate parent_holder information to childs

Bug 484956 part 3.

If a device (e.g. sda) has holders (lvm or mpath), it's children
do not have holders information in sysfs.

Make sure to propagate the information from parent to children
when scanning in sysfs.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 cman/qdisk/scandisk.c |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/cman/qdisk/scandisk.c b/cman/qdisk/scandisk.c
index 13251f1..9ff4bf6 100644
--- a/cman/qdisk/scandisk.c
+++ b/cman/qdisk/scandisk.c
@@ -631,10 +631,10 @@ static int sysfs_is_disk(char *path)
  * -1 on generic error
  * -2 -ENOMEM
  */
-static int scansysfs(struct devlisthead *devlisthead, char *path, int level)
+static int scansysfs(struct devlisthead *devlisthead, char *path, int level, int parent_holder)
 {
 	struct devnode *startnode;
-	int i, n, maj, min;
+	int i, n, maj, min, has_holder = 0;
 	struct dirent **namelist;
 	struct stat sb;
 	char newpath[MAXPATHLEN];
@@ -662,9 +662,16 @@ static int scansysfs(struct devlisthead *devlisthead, char *path, int level)
 				startnode->sysfsattrs.sysfs = 1;
 				startnode->sysfsattrs.removable =
 				    sysfs_is_removable(newpath);
-				startnode->sysfsattrs.holders =
-				    sysfs_has_subdirs_entries(newpath,
-							      "holders");
+
+				if (!parent_holder)
+					has_holder =
+					startnode->sysfsattrs.holders =
+					    sysfs_has_subdirs_entries(newpath,
+								      "holders");
+				else
+					has_holder =
+					startnode->sysfsattrs.holders = parent_holder;
+
 				startnode->sysfsattrs.slaves =
 				    sysfs_has_subdirs_entries(newpath,
 							      "slaves");
@@ -674,12 +681,12 @@ static int scansysfs(struct devlisthead *devlisthead, char *path, int level)
 
 			if (!stat(newpath, &sb) && !level)
 				if (S_ISDIR(sb.st_mode))
-					if (scansysfs(devlisthead, newpath, 1) < 0)
+					if (scansysfs(devlisthead, newpath, 1, has_holder) < 0)
 						return -1;
 
 			if (!lstat(newpath, &sb))
 				if (S_ISDIR(sb.st_mode))
-					if (scansysfs(devlisthead, newpath, 1) < 0)
+					if (scansysfs(devlisthead, newpath, 1, has_holder) < 0)
 						return -1;
 
 		}
@@ -730,7 +737,7 @@ struct devlisthead *scan_for_dev(struct devlisthead *devlisthead,
 	/* it's important we check those 3 errors and abort in case
 	 * as it means that we are running out of mem,
 	 */
-	devlisthead->sysfs = res = scansysfs(devlisthead, SYSBLOCKPATH, 0);
+	devlisthead->sysfs = res = scansysfs(devlisthead, SYSBLOCKPATH, 0, 0);
 	if (res < -1)
 		goto emergencyout;