Re: [PATCH 004/119] xfs: enable buffer deadlock postmortem diagnosis via ftrace

Christoph Hellwig
2016-06-17T11:34:28Z

> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index efa2a73..2333db7 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -947,7 +947,8 @@ xfs_buf_trylock(
> if (locked)
> XB_SET_OWNER(bp);
>
> - trace_xfs_buf_trylock(bp, _RET_IP_);
> + locked ? trace_xfs_buf_trylock(bp, _RET_IP_) :
> + trace_xfs_buf_trylock_fail(bp, _RET_IP_);
> return locked;

I think this should be something like:

if (locked) {
XB_SET_OWNER(bp);
trace_xfs_buf_trylock(bp, _RET_IP_);
} else {
trace_xfs_buf_trylock_fail(bp, _RET_IP_);
}

otherwise this looks good and can go in without the rest of the series.