---

yaml
---
r: 179557
b: refs/heads/master
c: 57817c6
h: refs/heads/master
i:
  179555: a48753e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 018027be90a6946e8cf3f9b17b5582384f7ed117
+refs/heads/master: 57817c68229984818fea9e614d6f95249c3fb098

trunk/fs/xfs/linux-2.6/xfs_super.c

@@ -954,16 +954,14 @@ xfs_fs_destroy_inode(
 	ASSERT_ALWAYS(!xfs_iflags_test(ip, XFS_IRECLAIM));
 
 	/*
-	 * If we have nothing to flush with this inode then complete the
-	 * teardown now, otherwise delay the flush operation.
+	 * We always use background reclaim here because even if the
+	 * inode is clean, it still may be under IO and hence we have
+	 * to take the flush lock. The background reclaim path handles
+	 * this more efficiently than we can here, so simply let background
+	 * reclaim tear down all inodes.
 	 */
-	if (!xfs_inode_clean(ip)) {
-		xfs_inode_set_reclaim_tag(ip);
-		return;
-	}
-
 out_reclaim:
-	xfs_ireclaim(ip);
+	xfs_inode_set_reclaim_tag(ip);
 }
 
 /*