summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_dquot_item.c
diff options
context:
space:
mode:
authorChristoph Hellwig2011-12-06 22:58:10 +0100
committerBen Myers2011-12-12 23:31:01 +0100
commitfdedf28b9492d69976110d12cc0d02d33c8ea7ea (patch)
treec7d390c58afa3fd342efadca88e3991c8cb5142f /fs/xfs/xfs_dquot_item.c
parentxfs: remove the lid_size field in struct log_item_desc (diff)
downloadkernel-qcow2-linux-fdedf28b9492d69976110d12cc0d02d33c8ea7ea.tar.gz
kernel-qcow2-linux-fdedf28b9492d69976110d12cc0d02d33c8ea7ea.tar.xz
kernel-qcow2-linux-fdedf28b9492d69976110d12cc0d02d33c8ea7ea.zip
xfs: untangle SYNC_WAIT and SYNC_TRYLOCK meanings for xfs_qm_dqflush
Only skip pinned dquots if SYNC_TRYLOCK is specified, and adjust the callers to keep the behaviour unchanged. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_dquot_item.c')
-rw-r--r--fs/xfs/xfs_dquot_item.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c
index 79da711e5dd2..3956e1bb7c07 100644
--- a/fs/xfs/xfs_dquot_item.c
+++ b/fs/xfs/xfs_dquot_item.c
@@ -133,7 +133,7 @@ xfs_qm_dquot_logitem_push(
* lock without sleeping, then there must not have been
* anyone in the process of flushing the dquot.
*/
- error = xfs_qm_dqflush(dqp, 0);
+ error = xfs_qm_dqflush(dqp, SYNC_TRYLOCK);
if (error)
xfs_warn(dqp->q_mount, "%s: push error %d on dqp %p",
__func__, error, dqp);