From 6c511058d48d2f09bf93506ffdf8fd79c7dc0a87 Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Wed, 27 Jun 2007 10:15:56 -0500
Subject: [PATCH] --- yaml --- r: 58587 b: refs/heads/master c:
 569a7b6c2e8965ff4908003b925757703a3d649c h: refs/heads/master i:   58585:
 54423990db6f40c2e2c09c06e2c0d4c4b08e2b1c   58583:
 3a2909652e11d8bd9891c8471d14e95a880d8099 v: v3

---
 [refs]                |  2 +-
 trunk/fs/gfs2/mount.c | 25 ++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 73583618d54d..623de8d95c25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 090ffaa55dacea774af9ee378d09e47fb7cea9ff
+refs/heads/master: 569a7b6c2e8965ff4908003b925757703a3d649c
diff --git a/trunk/fs/gfs2/mount.c b/trunk/fs/gfs2/mount.c
index 4864659555d4..6f006a804db3 100644
--- a/trunk/fs/gfs2/mount.c
+++ b/trunk/fs/gfs2/mount.c
@@ -82,20 +82,19 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, char *data_arg, int remount)
 	char *options, *o, *v;
 	int error = 0;
 
-	if (!remount) {
-		/*  If someone preloaded options, use those instead  */
-		spin_lock(&gfs2_sys_margs_lock);
-		if (gfs2_sys_margs) {
-			data = gfs2_sys_margs;
-			gfs2_sys_margs = NULL;
-		}
-		spin_unlock(&gfs2_sys_margs_lock);
-
-		/*  Set some defaults  */
-		args->ar_num_glockd = GFS2_GLOCKD_DEFAULT;
-		args->ar_quota = GFS2_QUOTA_DEFAULT;
-		args->ar_data = GFS2_DATA_DEFAULT;
+	/*  If someone preloaded options, use those instead  */
+	spin_lock(&gfs2_sys_margs_lock);
+	if (!remount && gfs2_sys_margs) {
+		data = gfs2_sys_margs;
+		gfs2_sys_margs = NULL;
 	}
+	spin_unlock(&gfs2_sys_margs_lock);
+
+	/*  Set some defaults  */
+	memset(args, 0, sizeof(struct gfs2_args));
+	args->ar_num_glockd = GFS2_GLOCKD_DEFAULT;
+	args->ar_quota = GFS2_QUOTA_DEFAULT;
+	args->ar_data = GFS2_DATA_DEFAULT;
 
 	/* Split the options into tokens with the "," character and
 	   process them */