cluster: STABLE2 - qdisk: fix device scanning.

cluster: STABLE2 - qdisk: fix device scanning.

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=84c48acd057dcc61ae2320ccda5845571ababa4c
Commit:        84c48acd057dcc61ae2320ccda5845571ababa4c
Parent:        1afc9a2aaed37a4ab7e1856fa80648d5c0c7be30
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Wed Feb 11 09:41:08 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Wed Feb 11 11:07:54 2009 +0100

qdisk: fix device scanning.

Bug 484956 part 1.

The basic sysfs scanning filter was completely wrong and it
was not scanning for full devices at all.

So entire devices like multipaths or sda where missing from the
original allocation.

This patch re-arrange the check so that we perform a full scan.

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

diff --git a/cman/qdisk/scandisk.c b/cman/qdisk/scandisk.c
index 4456e53..e393008 100644
--- a/cman/qdisk/scandisk.c
+++ b/cman/qdisk/scandisk.c
@@ -643,38 +643,37 @@ static int scansysfs(struct devlisthead *devlisthead, char *path, int level)
 			snprintf(newpath, sizeof(newpath),
 				 "%s/%s", path, namelist[n]->d_name);
 
-			if (!stat(newpath, &sb) && !level)
+			if (!stat(newpath, &sb) && !level) {
 				if (S_ISDIR(sb.st_mode))
 					if (scansysfs(devlisthead, newpath, 1) < 0)
 						return -1;
-
-			if (!lstat(newpath, &sb)) {
+			} else if (!lstat(newpath, &sb)) {
 				if (S_ISDIR(sb.st_mode))
 					if (scansysfs(devlisthead, newpath, 1) < 0)
 						return -1;
 
 				if (S_ISLNK(sb.st_mode))
 					continue;
+			}
 
-				if (sysfs_is_dev(newpath, &maj, &min) > 0) {
-					startnode =
-					    alloc_list_obj(devlisthead, maj,
-							   min);
-					if (!startnode)
-						return -2;
-
-					startnode->sysfsattrs.sysfs = 1;
-					startnode->sysfsattrs.removable =
-					    sysfs_is_removable(newpath);
-					startnode->sysfsattrs.holders =
-					    sysfs_has_subdirs_entries(newpath,
-								      "holders");
-					startnode->sysfsattrs.slaves =
-					    sysfs_has_subdirs_entries(newpath,
-								      "slaves");
-					startnode->sysfsattrs.disk =
-					    sysfs_is_disk(newpath);
-				}
+			if (sysfs_is_dev(newpath, &maj, &min) > 0) {
+				startnode =
+				    alloc_list_obj(devlisthead, maj,
+						   min);
+				if (!startnode)
+					return -2;
+
+				startnode->sysfsattrs.sysfs = 1;
+				startnode->sysfsattrs.removable =
+				    sysfs_is_removable(newpath);
+				startnode->sysfsattrs.holders =
+				    sysfs_has_subdirs_entries(newpath,
+							      "holders");
+				startnode->sysfsattrs.slaves =
+				    sysfs_has_subdirs_entries(newpath,
+							      "slaves");
+				startnode->sysfsattrs.disk =
+				    sysfs_is_disk(newpath);
 			}
 		}
 		free(namelist[n]);