aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunil Mushran <sunil.mushran@oracle.com>2009-08-19 18:16:01 -0400
committerJoel Becker <joel.becker@oracle.com>2009-09-23 04:54:46 -0400
commita2f2ddbf2bafdbc7e4f3bbf09439b42c8fee2747 (patch)
tree0b027ad2957530c457b2589d96c361232eabe740
parentbd50873dc725a9fa72592ecc986c58805e823051 (diff)
ocfs2: __ocfs2_abort() should not enable panic for local mounts
In a clustered setup, we have to panic the box on journal abort. This is because we don't have the facility to go hard readonly. With hard ro, another node would detect node failure and initiate recovery. Having said that, we shouldn't force panic if the volume is mounted locally. This patch defers the handling to the mount option, errors. Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com> Signed-off-by: Joel Becker <joel.becker@oracle.com>
-rw-r--r--fs/ocfs2/super.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 8b6062176970..154e62522b05 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -2494,7 +2494,8 @@ void __ocfs2_abort(struct super_block* sb,
2494 /* Force a panic(). This stinks, but it's better than letting 2494 /* Force a panic(). This stinks, but it's better than letting
2495 * things continue without having a proper hard readonly 2495 * things continue without having a proper hard readonly
2496 * here. */ 2496 * here. */
2497 OCFS2_SB(sb)->s_mount_opt |= OCFS2_MOUNT_ERRORS_PANIC; 2497 if (!ocfs2_mount_local(OCFS2_SB(sb)))
2498 OCFS2_SB(sb)->s_mount_opt |= OCFS2_MOUNT_ERRORS_PANIC;
2498 ocfs2_handle_error(sb); 2499 ocfs2_handle_error(sb);
2499} 2500}
2500 2501