From: Mark Fasheh <mark.fasheh@oracle.com>
Date: Wed, 7 Nov 2007 22:21:45 +0000 (-0800)
Subject: ocfs2: Reset journal parameters after s_mount_opt update
X-Git-Tag: v2.6.24-rc4~83^2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e001e796e47d29c470de6c2cd36400e03c66118b;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index be562ac3e89..5ee77542066 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;