git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[pandora-kernel.git]
/
fs
/
xfs
/
xfs_trans_buf.c
diff --git
a/fs/xfs/xfs_trans_buf.c
b/fs/xfs/xfs_trans_buf.c
index
3bea661
..
03b3b7f
100644
(file)
--- a/
fs/xfs/xfs_trans_buf.c
+++ b/
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);