From 37e62bcd6e09b3347c810e98484743bd85ed0aca Mon Sep 17 00:00:00 2001
From: Brian Foster <bfoster@redhat.com>
Date: Mon, 11 Feb 2013 10:08:22 -0500
Subject: [PATCH] --- yaml --- r: 352943 b: refs/heads/master c:
 fa5566e4ffb918131a054413eb42075a77a41413 h: refs/heads/master i:   352941:
 5a11ca9aa1a4911fee44ccc8f39e7253d646f6f1   352939:
 8d3cd03219576d6d605cf6bdfcd3ad9dcc214810   352935:
 69188e005d21726b38b036fdf4ff49aa76517dd6   352927:
 950259488e06455d17f29a02d47b2f1ac56f039d v: v3

---
 [refs]                 | 2 +-
 trunk/fs/xfs/xfs_buf.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 83ba0533db62..5acecdb347b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5337fe9b108d602c483fe9d62ffef9227acf3a74
+refs/heads/master: fa5566e4ffb918131a054413eb42075a77a41413
diff --git a/trunk/fs/xfs/xfs_buf.c b/trunk/fs/xfs/xfs_buf.c
index fbbb9eb92e32..4e8f0df82d02 100644
--- a/trunk/fs/xfs/xfs_buf.c
+++ b/trunk/fs/xfs/xfs_buf.c
@@ -951,8 +951,6 @@ xfs_buf_trylock(
 	locked = down_trylock(&bp->b_sema) == 0;
 	if (locked)
 		XB_SET_OWNER(bp);
-	else if (atomic_read(&bp->b_pin_count) && (bp->b_flags & XBF_STALE))
-		xfs_log_force(bp->b_target->bt_mount, 0);
 
 	trace_xfs_buf_trylock(bp, _RET_IP_);
 	return locked;