From c357e90b465443ae8b400456518b32318e6f3664 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@sandeen.net>
Date: Tue, 13 Dec 2011 23:12:45 +0000
Subject: [PATCH] --- yaml --- r: 280323 b: refs/heads/master c:
 687d1c5e8e26f68b0defb1b9ccd85a0955325b9d h: refs/heads/master i:   280321:
 b68a71f60efed143f2ded5c258cc67bd0ac182c0   280319:
 3f3315a313bbda9f1266e0438c0e9730657774c9 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/xfs/xfs_buf.c | 6 +-----
 trunk/fs/xfs/xfs_buf.h | 3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 172c1bf38be2..f903fcba6d3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ae4440723a413c7a52edd27f654c34680dd4ea2
+refs/heads/master: 687d1c5e8e26f68b0defb1b9ccd85a0955325b9d
diff --git a/trunk/fs/xfs/xfs_buf.c b/trunk/fs/xfs/xfs_buf.c
index cf0ac056815f..2277bcae395f 100644
--- a/trunk/fs/xfs/xfs_buf.c
+++ b/trunk/fs/xfs/xfs_buf.c
@@ -1701,12 +1701,8 @@ xfsbufd(
 		struct list_head tmp;
 		struct blk_plug plug;
 
-		if (unlikely(freezing(current))) {
-			set_bit(XBT_FORCE_SLEEP, &target->bt_flags);
+		if (unlikely(freezing(current)))
 			refrigerator();
-		} else {
-			clear_bit(XBT_FORCE_SLEEP, &target->bt_flags);
-		}
 
 		/* sleep for a long time if there is nothing to do. */
 		if (list_empty(&target->bt_delwri_queue))
diff --git a/trunk/fs/xfs/xfs_buf.h b/trunk/fs/xfs/xfs_buf.h
index 5bab046e859f..df7ffb0affe7 100644
--- a/trunk/fs/xfs/xfs_buf.h
+++ b/trunk/fs/xfs/xfs_buf.h
@@ -90,8 +90,7 @@ typedef unsigned int xfs_buf_flags_t;
 	{ _XBF_DELWRI_Q,	"DELWRI_Q" }
 
 typedef enum {
-	XBT_FORCE_SLEEP = 0,
-	XBT_FORCE_FLUSH = 1,
+	XBT_FORCE_FLUSH = 0,
 } xfs_buftarg_flags_t;
 
 typedef struct xfs_buftarg {