]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ocfs2: Skip mount recovery for hard-ro mounts
authorSunil Mushran <sunil.mushran@oracle.com>
Wed, 4 May 2011 17:28:02 +0000 (10:28 -0700)
committerJoel Becker <jlbec@evilplan.org>
Fri, 13 May 2011 18:27:14 +0000 (11:27 -0700)
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>
fs/ocfs2/journal.c

index b141a44605ca076132cd704e22226ac8ce263fa7..295d56454e8b23b6e9d97a6bd258e6170311c8f5 100644 (file)
@@ -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,