diff --git a/[refs] b/[refs]
index 95aa63217587..11c451cdcdcf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd50873dc725a9fa72592ecc986c58805e823051
+refs/heads/master: a2f2ddbf2bafdbc7e4f3bbf09439b42c8fee2747
diff --git a/trunk/fs/ocfs2/super.c b/trunk/fs/ocfs2/super.c
index 8b6062176970..154e62522b05 100644
--- a/trunk/fs/ocfs2/super.c
+++ b/trunk/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);
 }