From 814aca1b7baa1f140bcee3d5ea7fa706a71a7d9c Mon Sep 17 00:00:00 2001
From: Mark Fasheh <mark.fasheh@oracle.com>
Date: Wed, 18 Jan 2006 10:31:47 -0800
Subject: [PATCH] --- yaml --- r: 19720 b: refs/heads/master c:
 6eff5790d57a5c9c01489c95946881808a4b2a2c h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/ocfs2/journal.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 251a15b976b5..93519682500b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a1974fd4533afdb73873cdacb942d9a79ff7c9b
+refs/heads/master: 6eff5790d57a5c9c01489c95946881808a4b2a2c
diff --git a/trunk/fs/ocfs2/journal.c b/trunk/fs/ocfs2/journal.c
index b71b3385fdbd..fa0bcac5ceae 100644
--- a/trunk/fs/ocfs2/journal.c
+++ b/trunk/fs/ocfs2/journal.c
@@ -560,7 +560,11 @@ int ocfs2_journal_init(struct ocfs2_journal *journal, int *dirty)
 	SET_INODE_JOURNAL(inode);
 	OCFS2_I(inode)->ip_open_count++;
 
-	status = ocfs2_meta_lock(inode, NULL, &bh, 1);
+	/* Skip recovery waits here - journal inode metadata never
+	 * changes in a live cluster so it can be considered an
+	 * exception to the rule. */
+	status = ocfs2_meta_lock_full(inode, NULL, &bh, 1,
+				      OCFS2_META_LOCK_RECOVERY);
 	if (status < 0) {
 		if (status != -ERESTARTSYS)
 			mlog(ML_ERROR, "Could not get lock on journal!\n");