[PATCH] xfs: remove unused XBT_FORCE_SLEEP bit

[PATCH] xfs: remove unused XBT_FORCE_SLEEP bit

[Eric Sandeen]

XBT_FORCE_SLEEP is no longer ever tested; it is only set
and cleared.  Remove it.

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

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 {


_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs: remove unused XBT_FORCE_SLEEP bit

[Dave Chinner]

On Tue, Dec 13, 2011 at 05:12:45PM -0600, Eric Sandeen wrote:
> XBT_FORCE_SLEEP is no longer ever tested; it is only set
> and cleared.  Remove it.
> 
> Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
> ---
> 
> p.s. I left bt_flags as a bitfield even with only one bit defined now... OK?

Fine by me. The plan is to remove the xfsbufd completely (by doing
all metadata writeback from the AIL), anyway, so leaving it as a bit
field for the moment is not a problem...

Reviewed-by: Dave Chinner <dchinner@redhat.com>

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs: remove unused XBT_FORCE_SLEEP bit

[Ben Myers]

On Tue, Dec 13, 2011 at 05:12:45PM -0600, Eric Sandeen wrote:
> XBT_FORCE_SLEEP is no longer ever tested; it is only set
> and cleared.  Remove it.
> 
> Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

Yep... looks like XBT_FORCE_SLEEP is never tested.
Reviewed-by: Ben Myers <bpm@sgi.com>

> ---
> 
> 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 {
> 
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs