Merge branch 'xfs-4.8-misc-fixes-2' into for-next

This commit is contained in:
Dave Chinner
2016-06-21 11:55:13 +10:00
18 changed files with 246 additions and 166 deletions

View File

@@ -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;
}