瀏覽代碼

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>
Mark Fasheh 17 年之前
父節點
當前提交
e001e796e4
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      fs/ocfs2/super.c

+ 3 - 3
fs/ocfs2/super.c

@@ -438,14 +438,14 @@ unlock_osb:
 	}
 	}
 
 
 	if (!ret) {
 	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
 		/* Only save off the new mount options in case of a successful
 		 * remount. */
 		 * remount. */
 		osb->s_mount_opt = parsed_options.mount_opt;
 		osb->s_mount_opt = parsed_options.mount_opt;
 		osb->s_atime_quantum = parsed_options.atime_quantum;
 		osb->s_atime_quantum = parsed_options.atime_quantum;
 		osb->preferred_slot = parsed_options.slot;
 		osb->preferred_slot = parsed_options.slot;
+
+		if (!ocfs2_is_hard_readonly(osb))
+			ocfs2_set_journal_params(osb);
 	}
 	}
 out:
 out:
 	return ret;
 	return ret;