From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6674 invoked by alias); 12 Feb 2009 19:24:56 -0000 Received: (qmail 6668 invoked by alias); 12 Feb 2009 19:24:56 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: RHEL5 - qdisk: fix device scanning order. To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: d1ce031d18d7609c8b2ef7519992f21f8c3f1892 X-Git-Newrev: 6436ec784769ec39828edec0a8616d9e5b4152c0 From: Lon Hohberger Message-Id: <20090212192429.858F91201D2@lists.fedorahosted.org> Date: Thu, 12 Feb 2009 19:24:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00445.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6436ec784769ec39828edec0a8616d9e5b4152c0 Commit: 6436ec784769ec39828edec0a8616d9e5b4152c0 Parent: d1ce031d18d7609c8b2ef7519992f21f8c3f1892 Author: Fabio M. Di Nitto AuthorDate: Wed Feb 11 10:40:34 2009 +0100 Committer: Lon Hohberger CommitterDate: Thu Feb 12 14:22:53 2009 -0500 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 --- 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 803d149..1a09d47 100644 --- a/cman/qdisk/scandisk.c +++ b/cman/qdisk/scandisk.c @@ -648,18 +648,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 = @@ -679,7 +670,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]); }