Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d18c4d68 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

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



This reverts commit 569a7b6c. The
code was correct originally. The default setting for ACLs after a
remount should be to be the same as before the remount.

Signed-off-by: default avatarAbhijith Das <adas@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent b9af7ca6

fs/gfs2/mount.c

+13 −12
Original line number Diff line number Diff line
@@ -82,19 +82,20 @@ 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 (!remount && gfs2_sys_margs) {

		if (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 */