---

yaml --- r: 19720 b: refs/heads/master c: 6eff579 h: refs/heads/master v: v3
git-mirror · Feb 3, 2006 · 814aca1 · 814aca1
1 parent e468abb
commit 814aca1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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");