]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ocfs2: Reset journal parameters after s_mount_opt update
authorMark Fasheh <mark.fasheh@oracle.com>
Wed, 7 Nov 2007 22:21:45 +0000 (14:21 -0800)
committerMark Fasheh <mark.fasheh@oracle.com>
Wed, 28 Nov 2007 00:47:01 +0000 (16:47 -0800)
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>
fs/ocfs2/super.c

index be562ac3e89c25e690e2701cb500cf5c5c12ae77..5ee7754206651baceff8735e57b4b7382e2617e9 100644 (file)
@@ -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;