---

yaml --- r: 319831 b: refs/heads/master c: 76e8f13 h: refs/heads/master i: 319829: 7f8f5a0 319827: 8b954fe 319823: 2eaff1f v: v3
git-mirror · Jun 21, 2012 · d4c2078 · d4c2078
1 parent 3fa4954
commit d4c2078
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51c84223af604ce2d00d0416c30a38c50aed00bd
+refs/heads/master: 76e8f1386673b864cfca3c24c4d5814740e76465
diff --git a/trunk/fs/xfs/xfs_inode_item.c b/trunk/fs/xfs/xfs_inode_item.c
@@ -504,6 +504,14 @@ xfs_inode_item_push(
 		goto out_unlock;
 	}
 
+	/*
+	 * Stale inode items should force out the iclog.
+	 */
+	if (ip->i_flags & XFS_ISTALE) {
+		rval = XFS_ITEM_PINNED;
+		goto out_unlock;
+	}
+
 	/*
 	 * Someone else is already flushing the inode.  Nothing we can do
 	 * here but wait for the flush to finish and remove the item from
@@ -514,15 +522,6 @@ xfs_inode_item_push(
 		goto out_unlock;
 	}
 
-	/*
-	 * Stale inode items should force out the iclog.
-	 */
-	if (ip->i_flags & XFS_ISTALE) {
-		xfs_ifunlock(ip);
-		xfs_iunlock(ip, XFS_ILOCK_SHARED);
-		return XFS_ITEM_PINNED;
-	}
-
 	ASSERT(iip->ili_fields != 0 || XFS_FORCED_SHUTDOWN(ip->i_mount));
 	ASSERT(iip->ili_logged == 0 || XFS_FORCED_SHUTDOWN(ip->i_mount));