From 832ffda29c533eb3c71e59ffd430705dba23a85d Mon Sep 17 00:00:00 2001
From: Dave Chinner <dchinner@redhat.com>
Date: Sat, 26 Mar 2011 09:14:44 +1100
Subject: [PATCH] --- yaml --- r: 243205 b: refs/heads/master c:
 7401aafd5019d32a888e5f27332cf580945574bf h: refs/heads/master i:   243203:
 9d0f15933311a8b144e085743a0589830c61f5fd v: v3

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

diff --git a/[refs] b/[refs]
index fd136352dbbe..b9dad1085bc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bfd8d04190c615bb8d1d98188dead0c09702208
+refs/heads/master: 7401aafd5019d32a888e5f27332cf580945574bf
diff --git a/trunk/fs/xfs/xfs_trans_buf.c b/trunk/fs/xfs/xfs_trans_buf.c
index 3bea66132334..03b3b7f85a3b 100644
--- a/trunk/fs/xfs/xfs_trans_buf.c
+++ b/trunk/fs/xfs/xfs_trans_buf.c
@@ -383,7 +383,8 @@ xfs_trans_read_buf(
 	bp = xfs_buf_read(target, blkno, len, flags | XBF_DONT_BLOCK);
 	if (bp == NULL) {
 		*bpp = NULL;
-		return 0;
+		return (flags & XBF_TRYLOCK) ?
+					0 : XFS_ERROR(ENOMEM);
 	}
 	if (XFS_BUF_GETERROR(bp) != 0) {
 	    XFS_BUF_SUPER_STALE(bp);