aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorSunil Mushran <sunil.mushran@oracle.com>2011-05-04 10:28:02 -0700
committerJoel Becker <jlbec@evilplan.org>2011-05-13 11:27:14 -0700
commit10b3dd76117a327557b8cb898b41c18afd08dc86 (patch)
tree127b61f13ad5814aace6f2610a0cfe87d128072d /fs/ocfs2
parent33c12a5436464f8d4f56d68e5e79e24a3a1f11aa (diff)
downloadkernel_samsung_aries-10b3dd76117a327557b8cb898b41c18afd08dc86.zip
kernel_samsung_aries-10b3dd76117a327557b8cb898b41c18afd08dc86.tar.gz
kernel_samsung_aries-10b3dd76117a327557b8cb898b41c18afd08dc86.tar.bz2
ocfs2: Skip mount recovery for hard-ro mounts
Patch skips mount recovery for hard-ro mounts which otherwise leads to an oops. Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com> Acked-by: Mark Fasheh <mfasheh@suse.com> Signed-off-by: Joel Becker <jlbec@evilplan.org>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/journal.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index b141a44..295d564 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -1260,6 +1260,9 @@ void ocfs2_complete_mount_recovery(struct ocfs2_super *osb)
{
struct ocfs2_journal *journal = osb->journal;
+ if (ocfs2_is_hard_readonly(osb))
+ return;
+
/* No need to queue up our truncate_log as regular cleanup will catch
* that */
ocfs2_queue_recovery_completion(journal, osb->slot_num,