Commit b66b4498 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'gfs2-v5.4-rc5.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2

Pull gfs2 fix from Andreas Gruenbacher:
 "Fix remounting (broken in -rc1)."

* tag 'gfs2-v5.4-rc5.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: Fix initialisation of args for remount
parents 23fdb198 d5798141
...@@ -1540,17 +1540,23 @@ static int gfs2_init_fs_context(struct fs_context *fc) ...@@ -1540,17 +1540,23 @@ static int gfs2_init_fs_context(struct fs_context *fc)
{ {
struct gfs2_args *args; struct gfs2_args *args;
args = kzalloc(sizeof(*args), GFP_KERNEL); args = kmalloc(sizeof(*args), GFP_KERNEL);
if (args == NULL) if (args == NULL)
return -ENOMEM; return -ENOMEM;
if (fc->purpose == FS_CONTEXT_FOR_RECONFIGURE) {
struct gfs2_sbd *sdp = fc->root->d_sb->s_fs_info;
*args = sdp->sd_args;
} else {
memset(args, 0, sizeof(*args));
args->ar_quota = GFS2_QUOTA_DEFAULT; args->ar_quota = GFS2_QUOTA_DEFAULT;
args->ar_data = GFS2_DATA_DEFAULT; args->ar_data = GFS2_DATA_DEFAULT;
args->ar_commit = 30; args->ar_commit = 30;
args->ar_statfs_quantum = 30; args->ar_statfs_quantum = 30;
args->ar_quota_quantum = 60; args->ar_quota_quantum = 60;
args->ar_errors = GFS2_ERRORS_DEFAULT; args->ar_errors = GFS2_ERRORS_DEFAULT;
}
fc->fs_private = args; fc->fs_private = args;
fc->ops = &gfs2_context_ops; fc->ops = &gfs2_context_ops;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment