public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: Lon Hohberger <lon@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: RHEL5 - qdisk: fix device scanning order. Date: Thu, 12 Feb 2009 19:24:00 -0000 [thread overview] Message-ID: <20090212192429.858F91201D2@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6436ec784769ec39828edec0a8616d9e5b4152c0 Commit: 6436ec784769ec39828edec0a8616d9e5b4152c0 Parent: d1ce031d18d7609c8b2ef7519992f21f8c3f1892 Author: Fabio M. Di Nitto <fdinitto@redhat.com> AuthorDate: Wed Feb 11 10:40:34 2009 +0100 Committer: Lon Hohberger <lhh@redhat.com> 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 <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 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]); }
reply other threads:[~2009-02-12 19:24 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090212192429.858F91201D2@lists.fedorahosted.org \ --to=lon@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).