From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10883 invoked by alias); 27 Jan 2009 19:31:38 -0000 Received: (qmail 10876 invoked by alias); 27 Jan 2009 19:31:38 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Status: No, hits=-1.3 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 Subject: cluster: RHEL53 - gfs2-utils: Bug 482734 - No longer able to mount GFS volume with noatime, noquota options To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL53 X-Git-Reftype: branch X-Git-Oldrev: d494546f2c5d37ceadfdef2d99daba63d9432156 X-Git-Newrev: 443747661081fc81d872e609585e831350fb0802 From: Abhijith Das Message-Id: <20090127193106.4F41AC024D@lists.fedorahosted.org> Date: Tue, 27 Jan 2009 19:31: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/msg00303.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=443747661081fc81d872e609585e831350fb0802 Commit: 443747661081fc81d872e609585e831350fb0802 Parent: d494546f2c5d37ceadfdef2d99daba63d9432156 Author: Abhijith Das AuthorDate: Tue Jan 27 11:37:37 2009 -0600 Committer: Abhijith Das CommitterDate: Tue Jan 27 13:29:08 2009 -0600 gfs2-utils: Bug 482734 - No longer able to mount GFS volume with noatime,noquota options Z-stream clone of Bug 481762 A previously committed patch to allow NOATIME and NODIRATIME http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ea8e447f55864271a645a0b5ab32fb383bb8ad96 was broken. It didn't allow any other extra mount option to be used in conjunction with noatime or nodiratime. Mount would fail with an 'invalid argument' error. This patch fixes the incorrect parsing that causes the above error. --- gfs2/mount/util.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/gfs2/mount/util.c b/gfs2/mount/util.c index 027250d..f45ff3c 100644 --- a/gfs2/mount/util.c +++ b/gfs2/mount/util.c @@ -154,6 +154,10 @@ void parse_opts(struct mount_options *mo) /* Hack to get the noatime/nodiratime option through to gfs */ if ((mo->flags & (MS_NOATIME | MS_NODIRATIME)) && (strcmp(mo->type, "gfs") == 0)) { + if (mo->extra[0]) { + strcat(mo->extra, ","); + extra_len += 1; + } strcat(mo->extra, "gfs_noatime"); extra_len += strlen("gfs_noatime"); }