From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6562 invoked by alias); 12 Feb 2009 19:24:50 -0000 Received: (qmail 6550 invoked by alias); 12 Feb 2009 19:24:50 -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. 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: bf90935cc54ded61220a81fb9cb949bfa12b001f X-Git-Newrev: d1ce031d18d7609c8b2ef7519992f21f8c3f1892 From: Lon Hohberger Message-Id: <20090212192426.C7E501201D2@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/msg00444.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d1ce031d18d7609c8b2ef7519992f21f8c3f1892 Commit: d1ce031d18d7609c8b2ef7519992f21f8c3f1892 Parent: bf90935cc54ded61220a81fb9cb949bfa12b001f Author: Fabio M. Di Nitto AuthorDate: Wed Feb 11 09:41:08 2009 +0100 Committer: Lon Hohberger CommitterDate: Thu Feb 12 14:22:39 2009 -0500 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 --- 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 428891c..803d149 100644 --- a/cman/qdisk/scandisk.c +++ b/cman/qdisk/scandisk.c @@ -648,38 +648,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]);