---

yaml --- r: 243205 b: refs/heads/master c: 7401aaf h: refs/heads/master i: 243203: 9d0f159 v: v3
git-mirror · Mar 25, 2011 · 832ffda · 832ffda
1 parent 4445340
commit 832ffda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);