From fa093b95da2e1cfdf1af4e422fbb85d6fa659cf8 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Tue, 23 Aug 2011 08:28:03 +0000
Subject: [PATCH] --- yaml --- r: 269866 b: refs/heads/master c:
 375ec69d2ef6e0797f19f5823e36e249765c3d41 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0a26704f2d68..e2583692ce92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7271d243f9d1b4106289e4cf876c8b1203de59ab
+refs/heads/master: 375ec69d2ef6e0797f19f5823e36e249765c3d41
diff --git a/trunk/fs/xfs/xfs_buf.c b/trunk/fs/xfs/xfs_buf.c
index c57836dc778f..2e71a26da22e 100644
--- a/trunk/fs/xfs/xfs_buf.c
+++ b/trunk/fs/xfs/xfs_buf.c
@@ -1275,15 +1275,10 @@ xfs_buf_iorequest(
 {
 	trace_xfs_buf_iorequest(bp, _RET_IP_);
 
-	if (bp->b_flags & XBF_DELWRI) {
-		xfs_buf_delwri_queue(bp, 1);
-		return 0;
-	}
+	ASSERT(!(bp->b_flags & XBF_DELWRI));
 
-	if (bp->b_flags & XBF_WRITE) {
+	if (bp->b_flags & XBF_WRITE)
 		xfs_buf_wait_unpin(bp);
-	}
-
 	xfs_buf_hold(bp);
 
 	/* Set the count to 1 initially, this will stop an I/O