From 1912f3dd93fcc5547b76f3257198a1cbb73e367b Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Sat, 18 Jul 2009 18:14:58 -0400
Subject: [PATCH] --- yaml --- r: 162759 b: refs/heads/master c:
 837273b8a150a3761467573c5eb477791cf19268 h: refs/heads/master i:   162757:
 8fe7b2d1e07e12dcce46611f4511ba4bb59f0eb3   162755:
 34378bbb9cd1d7ad3c66a0e504ed492111a7b323   162751:
 52102e1cc9ad68ced492c62b05c7966dabf2f1b0 v: v3

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

diff --git a/[refs] b/[refs]
index ec1ed7be1778..0e752ca7b364 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea78cd5e6b6ebe123641382d5040252d19829332
+refs/heads/master: 837273b8a150a3761467573c5eb477791cf19268
diff --git a/trunk/fs/xfs/linux-2.6/xfs_buf.c b/trunk/fs/xfs/linux-2.6/xfs_buf.c
index e28800a9f2b5..da3b666f1ace 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_buf.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_buf.c
@@ -770,7 +770,7 @@ xfs_buf_associate_memory(
 	bp->b_pages = NULL;
 	bp->b_addr = mem;
 
-	rval = _xfs_buf_get_pages(bp, page_count, 0);
+	rval = _xfs_buf_get_pages(bp, page_count, XBF_DONT_BLOCK);
 	if (rval)
 		return rval;