diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-06-21 11:55:13 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-06-21 11:55:13 +1000 |
| commit | f477cedc4e79a3233847106a18bf67be9bdf20e9 (patch) | |
| tree | c7d0a000c9c2a865bf15322e99db9697f0aa53d7 /fs/xfs/xfs_buf.c | |
| parent | 9b7fad20760b8f47730f0353459dd39a89c415b9 (diff) | |
| parent | 19b54ee66c4c5de8f8db74d5914d9a97161460bf (diff) | |
Merge branch 'xfs-4.8-misc-fixes-2' into for-next
Diffstat (limited to 'fs/xfs/xfs_buf.c')
| -rw-r--r-- | fs/xfs/xfs_buf.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index efa2a734268f..4665ff6e5153 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c @@ -944,10 +944,12 @@ xfs_buf_trylock( int locked; locked = down_trylock(&bp->b_sema) == 0; - if (locked) + if (locked) { XB_SET_OWNER(bp); - - trace_xfs_buf_trylock(bp, _RET_IP_); + trace_xfs_buf_trylock(bp, _RET_IP_); + } else { + trace_xfs_buf_trylock_fail(bp, _RET_IP_); + } return locked; } |