GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-22 06:32:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

xfs: untangle SYNC_WAIT and SYNC_TRYLOCK meanings for xfs_qm_dqflush

Browse source 
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>
This commit is contained in:
Christoph Hellwig 2011-12-06 21:58:10 +00:00 • committed by Ben Myers
parent b39342134a
commit fdedf28b94
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fs/xfs/xfs_dquot.c
View file

@ -1169,7 +1169,7 @@ xfs_qm_dqflush(
* If not dirty, or it's pinned and we are not supposed to block, nada. * If not dirty, or it's pinned and we are not supposed to block, nada.
*/ */
if (!XFS_DQ_IS_DIRTY(dqp) || if (!XFS_DQ_IS_DIRTY(dqp) ||
(!(flags & SYNC_WAIT) && atomic_read(&dqp->q_pincount) > 0)) { ((flags & SYNC_TRYLOCK) && atomic_read(&dqp->q_pincount) > 0)) {
xfs_dqfunlock(dqp); xfs_dqfunlock(dqp);
return 0; return 0;
} }

2
fs/xfs/xfs_dquot_item.c
View file

@ -133,7 +133,7 @@ xfs_qm_dquot_logitem_push(
* lock without sleeping, then there must not have been * lock without sleeping, then there must not have been
* anyone in the process of flushing the dquot. * anyone in the process of flushing the dquot.
*/ */
error = xfs_qm_dqflush(dqp, 0); error = xfs_qm_dqflush(dqp, SYNC_TRYLOCK);
if (error) if (error)
xfs_warn(dqp->q_mount, "%s: push error %d on dqp %p", xfs_warn(dqp->q_mount, "%s: push error %d on dqp %p",
__func__, error, dqp); __func__, error, dqp);

4
fs/xfs/xfs_qm.c
View file

@ -1661,7 +1661,7 @@ xfs_qm_quotacheck(
* successfully. * successfully.
*/ */
if (!error) if (!error)
error = xfs_qm_dqflush_all(mp, 0); error = xfs_qm_dqflush_all(mp, SYNC_TRYLOCK);
/* /*
* We can get this error if we couldn't do a dquot allocation inside * We can get this error if we couldn't do a dquot allocation inside
@ -1874,7 +1874,7 @@ again:
* We flush it delayed write, so don't bother * We flush it delayed write, so don't bother
* releasing the freelist lock. * releasing the freelist lock.
*/ */
error = xfs_qm_dqflush(dqp, 0); error = xfs_qm_dqflush(dqp, SYNC_TRYLOCK);
if (error) { if (error) {
xfs_warn(mp, "%s: dquot %p flush failed", xfs_warn(mp, "%s: dquot %p flush failed",
__func__, dqp); __func__, dqp);