From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25388 invoked by alias); 19 Aug 2008 21:02:58 -0000 Received: (qmail 25382 invoked by alias); 19 Aug 2008 21:02:57 -0000 X-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com X-Spam-Level: Subject: RHEL5 - groupd: ignore nolock gfs fix 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: feafe729f0fa9104854c1a79f59a5ff5813db828 X-Git-Newrev: 928f894f0156291264b7981140cea10bb0128141 From: David Teigland Message-Id: <20080819210143.3CDFC1202A5@lists.fedorahosted.org> Date: Tue, 19 Aug 2008 21:05: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: 2008-q3/txt/msg00280.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=928f894f0156291264b7981140cea10bb0128141 Commit: 928f894f0156291264b7981140cea10bb0128141 Parent: feafe729f0fa9104854c1a79f59a5ff5813db828 Author: David Teigland AuthorDate: Tue Aug 19 15:50:34 2008 -0500 Committer: David Teigland CommitterDate: Tue Aug 19 15:50:34 2008 -0500 groupd: ignore nolock gfs fix This commit was missing a call to close(). bz 315741 When starting up, we look for existing, "uncontrolled" gfs file systems in the kernel (which would require the node to be rebooted.) This check needs to ignore nolock fs's. Signed-off-by: David Teigland --- group/daemon/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/group/daemon/main.c b/group/daemon/main.c index c80a024..90a9b48 100644 --- a/group/daemon/main.c +++ b/group/daemon/main.c @@ -126,6 +126,7 @@ static int ignore_gfs_nolock(char *sysfs_dir, char *table) if (fd < 0) return 1; + close(fd); return 0; }