]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
xfs: remove log force from xfs_buf_trylock()
authorBrian Foster <bfoster@redhat.com>
Mon, 11 Feb 2013 15:08:22 +0000 (10:08 -0500)
committerBen Myers <bpm@sgi.com>
Thu, 14 Feb 2013 23:24:53 +0000 (17:24 -0600)
commitfa5566e4ffb918131a054413eb42075a77a41413
tree48feb3221aa163294a36e19355703fe6bba07a4e
parent5337fe9b108d602c483fe9d62ffef9227acf3a74
xfs: remove log force from xfs_buf_trylock()

The trylock log force invoked via xfs_buf_item_push() can attempt
to acquire xa_lock, thus leading to a recursion bug when called
with xa_lock held.

This log force was originally added to xfs_buf_trylock() to address
xfsaild stalls due to pinned and stale buffers. Since the addition
of this behavior, the log item pushing code had been reworked to
detect and track pinned items to inform xfsaild to issue a log
force itself when necessary. As such, the log force on trylock
failure is redundant and safe to remove.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
fs/xfs/xfs_buf.c