diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-04-05 09:12:41 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-04-05 09:12:41 +0200 |
| commit | 09f68072b32089f2e3b4749161eb3ce954faf8d4 (patch) | |
| tree | b8b3c84f8a9c7150c2d830428daa3d641917ecf3 /fs/xfs/xfs_trans_buf.c | |
| parent | d454f39f3ff3ee5a818c271026081a48a537bd41 (diff) | |
| parent | ef49e4fae3f364af8da041dcc1bb4931c749b3da (diff) | |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'fs/xfs/xfs_trans_buf.c')
| -rw-r--r-- | fs/xfs/xfs_trans_buf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c index 3bea66132334..03b3b7f85a3b 100644 --- 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); |