public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: STABLE2 - qdisk: fix device scanning. Date: Wed, 11 Feb 2009 10:08:00 -0000 [thread overview] Message-ID: <20090211100820.0C184120198@lists.fedorahosted.org> (raw) 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]);
reply other threads:[~2009-02-11 10:08 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=20090211100820.0C184120198@lists.fedorahosted.org \ --to=fabbione@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).