From a12856a4b4d51ed471cbd7f8ac259996a1c54456 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Mon, 10 Oct 2011 16:52:44 +0000
Subject: [PATCH] --- yaml --- r: 269921 b: refs/heads/master c:
 5fde0326ddb1472ef31034c8ed952a19d4679191 h: refs/heads/master i:   269919:
 307bf406dd92dc19ff4f5d3012fd1f4c6a3bc562 v: v3

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

diff --git a/[refs] b/[refs]
index 074164ea6fa5..2678daf9765e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b17b833443a3b65907f5ecb36f8af33996f6ec78
+refs/heads/master: 5fde0326ddb1472ef31034c8ed952a19d4679191
diff --git a/trunk/fs/xfs/xfs_buf.c b/trunk/fs/xfs/xfs_buf.c
index e0339a4a0bc8..36fed03da26f 100644
--- a/trunk/fs/xfs/xfs_buf.c
+++ b/trunk/fs/xfs/xfs_buf.c
@@ -1100,7 +1100,7 @@ xfs_bioerror_relse(
 		 * ASYNC buffers.
 		 */
 		xfs_buf_ioerror(bp, EIO);
-		XFS_BUF_FINISH_IOWAIT(bp);
+		complete(&bp->b_iowait);
 	} else {
 		xfs_buf_relse(bp);
 	}
diff --git a/trunk/fs/xfs/xfs_buf.h b/trunk/fs/xfs/xfs_buf.h
index cb54cc234ed1..65181220c9a2 100644
--- a/trunk/fs/xfs/xfs_buf.h
+++ b/trunk/fs/xfs/xfs_buf.h
@@ -293,8 +293,6 @@ static inline int xfs_buf_ispinned(struct xfs_buf *bp)
 	return atomic_read(&bp->b_pin_count);
 }
 
-#define XFS_BUF_FINISH_IOWAIT(bp)	complete(&bp->b_iowait);
-
 static inline void xfs_buf_relse(xfs_buf_t *bp)
 {
 	xfs_buf_unlock(bp);