cluster: RHEL5 - 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=482570c3e6d872d3f437cf46f5f3c35c392ee24f
Commit:        482570c3e6d872d3f437cf46f5f3c35c392ee24f
Parent:        8a4dd5f1237d8db22d91fd40d4c49764fe0de54a
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:37:37 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 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");
 	}