From ae78cfaa87f0f816010e3fbf6bb3b915f7f79df8 Mon Sep 17 00:00:00 2001
From: Dave Chinner <david@fromorbit.com>
Date: Thu, 4 Feb 2010 10:09:14 +1100
Subject: [PATCH] --- yaml --- r: 181823 b: refs/heads/master c:
 5322892d867e186c6b4c5fff5c99ea4863696a60 h: refs/heads/master i:   181821:
 c671fe77a392cba7b208657c05c18964a4d3e1d5   181819:
 94818f5296d3f20376b81d0f364687bf3bd5b8e2   181815:
 b936d3f7a6d1d31dcbfb65dfafe5d1dba19a1058   181807:
 c98637fcadfb2e16e009dec3b6e11241bd59843f   181791:
 eb9712ee2abe8742cace6404ab7f47814408fd03   181759:
 f6c24e1200baef6b7603ceba408cb9ac08e5c543 v: v3

---
 [refs]                           |  2 +-
 trunk/fs/xfs/linux-2.6/xfs_buf.c | 19 -------------------
 trunk/fs/xfs/linux-2.6/xfs_buf.h |  1 -
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 2266a54b1b56..ba795033f825 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07fec73625dc0db6f9aed68019918208a2ca53f5
+refs/heads/master: 5322892d867e186c6b4c5fff5c99ea4863696a60
diff --git a/trunk/fs/xfs/linux-2.6/xfs_buf.c b/trunk/fs/xfs/linux-2.6/xfs_buf.c
index 4556a4c31e36..d50df3a8101c 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_buf.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_buf.c
@@ -1078,25 +1078,6 @@ xfs_bwrite(
 	return error;
 }
 
-int
-xfs_bawrite(
-	void			*mp,
-	struct xfs_buf		*bp)
-{
-	trace_xfs_buf_bawrite(bp, _RET_IP_);
-
-	ASSERT(bp->b_bn != XFS_BUF_DADDR_NULL);
-
-	xfs_buf_delwri_dequeue(bp);
-
-	bp->b_flags &= ~(XBF_READ | XBF_DELWRI | XBF_READ_AHEAD);
-	bp->b_flags |= (XBF_WRITE | XBF_ASYNC | _XBF_RUN_QUEUES);
-
-	bp->b_mount = mp;
-	bp->b_strat = xfs_bdstrat_cb;
-	return xfs_bdstrat_cb(bp);
-}
-
 void
 xfs_bdwrite(
 	void			*mp,
diff --git a/trunk/fs/xfs/linux-2.6/xfs_buf.h b/trunk/fs/xfs/linux-2.6/xfs_buf.h
index be45e8c5768d..386e7361e50e 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_buf.h
+++ b/trunk/fs/xfs/linux-2.6/xfs_buf.h
@@ -233,7 +233,6 @@ extern void xfs_buf_unlock(xfs_buf_t *);
 
 /* Buffer Read and Write Routines */
 extern int xfs_bwrite(struct xfs_mount *mp, struct xfs_buf *bp);
-extern int xfs_bawrite(void *mp, xfs_buf_t *bp);
 extern void xfs_bdwrite(void *mp, xfs_buf_t *bp);
 
 extern void xfsbdstrat(struct xfs_mount *, struct xfs_buf *);