ocfs2: Skip mount recovery for hard-ro mounts

Sunil Mushran · jlbec · commit 10b3dd76117a · 2011-05-13T11:27:14.000-07:00
Patch skips mount recovery for hard-ro mounts which otherwise leads to an oops.

Signed-off-by: Sunil Mushran &lt;sunil.mushran@oracle.com&gt;
Acked-by: Mark Fasheh &lt;mfasheh@suse.com&gt;
Signed-off-by: Joel Becker &lt;jlbec@evilplan.org&gt;
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -1260,6 +1260,9 @@ void ocfs2_complete_mount_recovery(struct ocfs2_super *osb)`
`1260`	`1260`	`{`
`1261`	`1261`	`struct ocfs2_journal *journal = osb->journal;`
`1262`	`1262`
	`1263`	`+ if (ocfs2_is_hard_readonly(osb))`
	`1264`	`+ return;`
	`1265`	`+`
`1263`	`1266`	`/* No need to queue up our truncate_log as regular cleanup will catch`
`1264`	`1267`	`* that */`
`1265`	`1268`	`ocfs2_queue_recovery_completion(journal, osb->slot_num,`