summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMark Fasheh <mark.fasheh@oracle.com>2007-11-07 14:21:45 -0800
committerMark Fasheh <mark.fasheh@oracle.com>2007-11-27 16:47:01 -0800
commite001e796e47d29c470de6c2cd36400e03c66118b (patch)
treede9996650fdcfaed6579601af75e45e261e111c7 /fs
parent7749c902592f610dc448830210174ab922f54be9 (diff)
downloadop-kernel-dev-e001e796e47d29c470de6c2cd36400e03c66118b.zip
op-kernel-dev-e001e796e47d29c470de6c2cd36400e03c66118b.tar.gz
ocfs2: Reset journal parameters after s_mount_opt update
Right now we're just setting them from the existing parameters, not the new ones that a remount specified. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/super.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index be562ac..5ee7754 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -438,14 +438,14 @@ unlock_osb:
}
if (!ret) {
- if (!ocfs2_is_hard_readonly(osb))
- ocfs2_set_journal_params(osb);
-
/* Only save off the new mount options in case of a successful
* remount. */
osb->s_mount_opt = parsed_options.mount_opt;
osb->s_atime_quantum = parsed_options.atime_quantum;
osb->preferred_slot = parsed_options.slot;
+
+ if (!ocfs2_is_hard_readonly(osb))
+ ocfs2_set_journal_params(osb);
}
out:
return ret;
OpenPOWER on IntegriCloud