[GFS2] remounting w/o acl option leaves acls enabled

This patch is for bugzilla bug #245663.  This crosswrites a fix from
gfs1 (bz #210369) so that the mount options are reset properly upon
remount.  This was tested on system trin-10.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

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) {
+	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 */