From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29200 invoked by alias); 27 Jan 2009 18:02:05 -0000 Received: (qmail 29091 invoked by alias); 27 Jan 2009 18:02:04 -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: gfs2-utils: master - gfs2-utils: Bug 481762 - No longer able to mount GFS volume with noatime, noquota options To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: gfs2-utils.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 157c9668abbe8bac268c929238922dce17b74f34 X-Git-Newrev: 444ddc9714656acff00a9a4100a20cd3d0414426 From: Abhijith Das Message-Id: <20090127180138.AAFE7C024D@lists.fedorahosted.org> Date: Tue, 27 Jan 2009 18:02: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/msg00302.txt.bz2 Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=444ddc9714656acff00a9a4100a20cd3d0414426 Commit: 444ddc9714656acff00a9a4100a20cd3d0414426 Parent: 157c9668abbe8bac268c929238922dce17b74f34 Author: Abhijith Das AuthorDate: Tue Jan 27 11:37:37 2009 -0600 Committer: Abhijith Das CommitterDate: Tue Jan 27 12:00:25 2009 -0600 gfs2-utils: Bug 481762 - No longer able to mount GFS volume with noatime,noquota options 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 d65d710..cbe2a3a 100644 --- a/gfs2/mount/util.c +++ b/gfs2/mount/util.c @@ -144,6 +144,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"); }