xfs
[Top] [All Lists]

[PATCH] xfs: remove unused XBT_FORCE_SLEEP bit

To: xfs-oss <xfs@xxxxxxxxxxx>
Subject: [PATCH] xfs: remove unused XBT_FORCE_SLEEP bit
From: Eric Sandeen <sandeen@xxxxxxxxxxx>
Date: Tue, 13 Dec 2011 17:12:45 -0600
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:8.0) Gecko/20111105 Thunderbird/8.0
XBT_FORCE_SLEEP is no longer ever tested; it is only set
and cleared.  Remove it.

Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxxx>
---

p.s. I left bt_flags as a bitfield even with only one bit defined now... OK?

diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index 5e68099..f7830c3 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -1762,12 +1762,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_delwrite_queue))
diff --git a/fs/xfs/linux-2.6/xfs_buf.h b/fs/xfs/linux-2.6/xfs_buf.h
index 50a7d5f..1b4aec1 100644
--- a/fs/xfs/linux-2.6/xfs_buf.h
+++ b/fs/xfs/linux-2.6/xfs_buf.h
@@ -87,8 +87,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_bufhash {


<Prev in Thread] Current Thread [Next in Thread>