[GFS2] Revert remounting w/o acl option leaves acls enabled
This reverts commit 569a7b6c2e
. 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: Abhijith Das <adas@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
parent
b9af7ca6d3
commit
d18c4d687d
|
@ -82,19 +82,20 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, char *data_arg, int remount)
|
||||||
char *options, *o, *v;
|
char *options, *o, *v;
|
||||||
int error = 0;
|
int error = 0;
|
||||||
|
|
||||||
/* If someone preloaded options, use those instead */
|
if (!remount) {
|
||||||
spin_lock(&gfs2_sys_margs_lock);
|
/* If someone preloaded options, use those instead */
|
||||||
if (!remount && gfs2_sys_margs) {
|
spin_lock(&gfs2_sys_margs_lock);
|
||||||
data = gfs2_sys_margs;
|
if (gfs2_sys_margs) {
|
||||||
gfs2_sys_margs = NULL;
|
data = gfs2_sys_margs;
|
||||||
}
|
gfs2_sys_margs = NULL;
|
||||||
spin_unlock(&gfs2_sys_margs_lock);
|
}
|
||||||
|
spin_unlock(&gfs2_sys_margs_lock);
|
||||||
|
|
||||||
/* Set some defaults */
|
/* Set some defaults */
|
||||||
memset(args, 0, sizeof(struct gfs2_args));
|
args->ar_num_glockd = GFS2_GLOCKD_DEFAULT;
|
||||||
args->ar_num_glockd = GFS2_GLOCKD_DEFAULT;
|
args->ar_quota = GFS2_QUOTA_DEFAULT;
|
||||||
args->ar_quota = GFS2_QUOTA_DEFAULT;
|
args->ar_data = GFS2_DATA_DEFAULT;
|
||||||
args->ar_data = GFS2_DATA_DEFAULT;
|
}
|
||||||
|
|
||||||
/* Split the options into tokens with the "," character and
|
/* Split the options into tokens with the "," character and
|
||||||
process them */
|
process them */
|
||||||
|
|
Loading…
Reference in a new issue