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

cluster: RHEL53 - gfs2-utils: Bug 482734 - 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=443747661081fc81d872e609585e831350fb0802
Commit:        443747661081fc81d872e609585e831350fb0802
Parent:        d494546f2c5d37ceadfdef2d99daba63d9432156
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 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");
 	}