Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+13
-7
+13
-7
fs/gfs2/ops_fstype.c
+13
-7
fs/gfs2/ops_fstype.c
···
1540
1540
{
1541
1541
struct gfs2_args *args;
1542
1542
1543
-
args = kzalloc(sizeof(*args), GFP_KERNEL);
1543
+
args = kmalloc(sizeof(*args), GFP_KERNEL);
1544
1544
if (args == NULL)
1545
1545
return -ENOMEM;
1546
1546
1547
-
args->ar_quota = GFS2_QUOTA_DEFAULT;
1548
-
args->ar_data = GFS2_DATA_DEFAULT;
1549
-
args->ar_commit = 30;
1550
-
args->ar_statfs_quantum = 30;
1551
-
args->ar_quota_quantum = 60;
1552
-
args->ar_errors = GFS2_ERRORS_DEFAULT;
1547
+
if (fc->purpose == FS_CONTEXT_FOR_RECONFIGURE) {
1548
+
struct gfs2_sbd *sdp = fc->root->d_sb->s_fs_info;
1553
1549
1550
+
*args = sdp->sd_args;
1551
+
} else {
1552
+
memset(args, 0, sizeof(*args));
1553
+
args->ar_quota = GFS2_QUOTA_DEFAULT;
1554
+
args->ar_data = GFS2_DATA_DEFAULT;
1555
+
args->ar_commit = 30;
1556
+
args->ar_statfs_quantum = 30;
1557
+
args->ar_quota_quantum = 60;
1558
+
args->ar_errors = GFS2_ERRORS_DEFAULT;
1559
+
}
1554
1560
fc->fs_private = args;
1555
1561
fc->ops = &gfs2_context_ops;
1556
1562
return 0;