---

yaml --- r: 352943 b: refs/heads/master c: fa5566e h: refs/heads/master i: 352941: 5a11ca9 352939: 8d3cd03 352935: 69188e0 352927: 9502594 v: v3
git-mirror · Feb 14, 2013 · 37e62bc · 37e62bc
1 parent 9bab910
commit 37e62bc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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;