From 3ed7f217b0090529cd4ecea4fe99f094e0685bff Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@sgi.com>
Date: Wed, 11 Jan 2006 20:49:57 +1100
Subject: [PATCH] --- yaml --- r: 18180 b: refs/heads/master c:
 da7f93e9eec0885317351eb8a20cc550ed48f470 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/fs/xfs/linux-2.6/xfs_buf.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index fadedf780102..0908ebcfb328 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5e596bbef3b0fa583c66c5a83dc9737c0fe2610
+refs/heads/master: da7f93e9eec0885317351eb8a20cc550ed48f470
diff --git a/trunk/fs/xfs/linux-2.6/xfs_buf.c b/trunk/fs/xfs/linux-2.6/xfs_buf.c
index cb77f99cbef1..6282f034b269 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_buf.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_buf.c
@@ -1649,14 +1649,13 @@ xfsbufd_wakeup(
 	int			priority,
 	gfp_t			mask)
 {
-	xfs_buftarg_t		*btp, *n;
+	xfs_buftarg_t		*btp;
 
 	spin_lock(&xfs_buftarg_lock);
-	list_for_each_entry_safe(btp, n, &xfs_buftarg_list, bt_list) {
+	list_for_each_entry(btp, &xfs_buftarg_list, bt_list) {
 		if (test_bit(XBT_FORCE_SLEEP, &btp->bt_flags))
 			continue;
 		set_bit(XBT_FORCE_FLUSH, &btp->bt_flags);
-		barrier();
 		wake_up_process(btp->bt_task);
 	}
 	spin_unlock(&xfs_buftarg_lock);