This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: STABLE2 - qdisk: fix device scanning order.
- From: "Fabio M. Di Nitto" <fabbione at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Wed, 11 Feb 2009 10:08:22 +0000 (UTC)
- Subject: cluster: STABLE2 - qdisk: fix device scanning order.
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=cec63d245b5a79136a4dcab8dbddb3d5e275b220
Commit: cec63d245b5a79136a4dcab8dbddb3d5e275b220
Parent: 84c48acd057dcc61ae2320ccda5845571ababa4c
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Wed Feb 11 10:40:34 2009 +0100
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Wed Feb 11 11:07:57 2009 +0100
qdisk: fix device scanning order.
Bug 484956 part 2.
This patch re-arrange the check so that full devices are always scanned
before the underneath partitions.
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
cman/qdisk/scandisk.c | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/cman/qdisk/scandisk.c b/cman/qdisk/scandisk.c
index e393008..4a0935f 100644
--- a/cman/qdisk/scandisk.c
+++ b/cman/qdisk/scandisk.c
@@ -643,18 +643,9 @@ 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 (S_ISDIR(sb.st_mode))
- if (scansysfs(devlisthead, newpath, 1) < 0)
- return -1;
- } else if (!lstat(newpath, &sb)) {
- if (S_ISDIR(sb.st_mode))
- if (scansysfs(devlisthead, newpath, 1) < 0)
- return -1;
-
+ if (!lstat(newpath, &sb) && level)
if (S_ISLNK(sb.st_mode))
continue;
- }
if (sysfs_is_dev(newpath, &maj, &min) > 0) {
startnode =
@@ -674,7 +665,20 @@ static int scansysfs(struct devlisthead *devlisthead, char *path, int level)
"slaves");
startnode->sysfsattrs.disk =
sysfs_is_disk(newpath);
+
+ printf("Allocated: %s holders: %d\n", newpath, startnode->sysfsattrs.holders);
}
+
+ if (!stat(newpath, &sb) && !level)
+ if (S_ISDIR(sb.st_mode))
+ if (scansysfs(devlisthead, newpath, 1) < 0)
+ return -1;
+
+ if (!lstat(newpath, &sb))
+ if (S_ISDIR(sb.st_mode))
+ if (scansysfs(devlisthead, newpath, 1) < 0)
+ return -1;
+
}
free(namelist[n]);
}