diff options
| author | Sunil Mushran <sunil.mushran@oracle.com> | 2009-08-19 15:16:01 -0700 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2009-09-23 01:54:46 -0700 |
| commit | a2f2ddbf2bafdbc7e4f3bbf09439b42c8fee2747 (patch) | |
| tree | 0b027ad2957530c457b2589d96c361232eabe740 /fs | |
| parent | bd50873dc725a9fa72592ecc986c58805e823051 (diff) | |
| download | op-kernel-dev-a2f2ddbf2bafdbc7e4f3bbf09439b42c8fee2747.zip op-kernel-dev-a2f2ddbf2bafdbc7e4f3bbf09439b42c8fee2747.tar.gz | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/super.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 8b60621..154e625 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -2494,7 +2494,8 @@ void __ocfs2_abort(struct super_block* sb, /* Force a panic(). This stinks, but it's better than letting * things continue without having a proper hard readonly * here. */ - OCFS2_SB(sb)->s_mount_opt |= OCFS2_MOUNT_ERRORS_PANIC; + if (!ocfs2_mount_local(OCFS2_SB(sb))) + OCFS2_SB(sb)->s_mount_opt |= OCFS2_MOUNT_ERRORS_PANIC; ocfs2_handle_error(sb); } |
