cluster: STABLE2 - gfs2-utils: Bug 481762 - No longer able to mount GFS volume with noatime, noquota options

[Abhijith Das]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f1dea0e9bf3e455b74a7ffc59d1245def133ef02
Commit:        f1dea0e9bf3e455b74a7ffc59d1245def133ef02
Parent:        ae3c642aae88d25ff38a55f2e5afbf831466818a
Author:        Abhijith Das <adas@redhat.com>
AuthorDate:    Tue Jan 27 11:37:37 2009 -0600
Committer:     Abhijith Das <adas@redhat.com>
CommitterDate: Tue Jan 27 11:45:19 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 bfb03d0..92a77d6 100644
--- a/gfs2/mount/util.c
+++ b/gfs2/mount/util.c
@@ -146,6 +146,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");
 	}