[Ocfs2-commits] mfasheh commits r2746 - branches/ocfs2-1.0/fs/ocfs2

[svn-commits@oss.oracle.com]

Author: mfasheh
Signed-off-by: smushran
Date: 2006-01-18 12:43:56 -0600 (Wed, 18 Jan 2006)
New Revision: 2746

Modified:
   branches/ocfs2-1.0/fs/ocfs2/journal.c
Log:
* Backport svn r2745 from ocfs2-1.2:
  - Don't wait on recovery when locking journal

Signed-off-by: smushran



Modified: branches/ocfs2-1.0/fs/ocfs2/journal.c
===================================================================
--- branches/ocfs2-1.0/fs/ocfs2/journal.c	2006-01-18 18:42:13 UTC (rev 2745)
+++ branches/ocfs2-1.0/fs/ocfs2/journal.c	2006-01-18 18:43:56 UTC (rev 2746)
@@ -520,7 +520,11 @@
 	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, NULL, 0);
 	if (status < 0) {
 		if (status != -ERESTARTSYS)
 			mlog(ML_ERROR, "Could not get lock on journal!\n");