diff options
author | Christoph Hellwig <hch@infradead.org> | 2010-01-19 04:56:46 -0500 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2010-01-21 14:44:49 -0500 |
commit | a14a348bff2f99471a28e5928eb6801224c053d8 (patch) | |
tree | 9a34d7e988cd78bc9b19369cbad3ad009b9a2bfd /fs/xfs/quota/xfs_dquot.c | |
parent | 4139b3b337cffd106744386c842b89dc86e31d4b (diff) |
xfs: cleanup up xfs_log_force calling conventions
Remove the XFS_LOG_FORCE argument which was always set, and the
XFS_LOG_URGE define, which was never used.
Split xfs_log_force into a two helpers - xfs_log_force which forces
the whole log, and xfs_log_force_lsn which forces up to the
specified LSN. The underlying implementations already were entirely
separate, as were the users.
Also re-indent the new _xfs_log_force/_xfs_log_force which
previously had a weird coding style.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/quota/xfs_dquot.c')
-rw-r--r-- | fs/xfs/quota/xfs_dquot.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/xfs/quota/xfs_dquot.c b/fs/xfs/quota/xfs_dquot.c index 5756392ffde..f9baeedbfdf 100644 --- a/fs/xfs/quota/xfs_dquot.c +++ b/fs/xfs/quota/xfs_dquot.c | |||
@@ -1248,7 +1248,7 @@ xfs_qm_dqflush( | |||
1248 | */ | 1248 | */ |
1249 | if (XFS_BUF_ISPINNED(bp)) { | 1249 | if (XFS_BUF_ISPINNED(bp)) { |
1250 | trace_xfs_dqflush_force(dqp); | 1250 | trace_xfs_dqflush_force(dqp); |
1251 | xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE); | 1251 | xfs_log_force(mp, 0); |
1252 | } | 1252 | } |
1253 | 1253 | ||
1254 | if (flags & XFS_QMOPT_DELWRI) { | 1254 | if (flags & XFS_QMOPT_DELWRI) { |
@@ -1531,11 +1531,9 @@ xfs_qm_dqflock_pushbuf_wait( | |||
1531 | if (bp != NULL) { | 1531 | if (bp != NULL) { |
1532 | if (XFS_BUF_ISDELAYWRITE(bp)) { | 1532 | if (XFS_BUF_ISDELAYWRITE(bp)) { |
1533 | int error; | 1533 | int error; |
1534 | if (XFS_BUF_ISPINNED(bp)) { | 1534 | |
1535 | xfs_log_force(dqp->q_mount, | 1535 | if (XFS_BUF_ISPINNED(bp)) |
1536 | (xfs_lsn_t)0, | 1536 | xfs_log_force(dqp->q_mount, 0); |
1537 | XFS_LOG_FORCE); | ||
1538 | } | ||
1539 | error = xfs_bawrite(dqp->q_mount, bp); | 1537 | error = xfs_bawrite(dqp->q_mount, bp); |
1540 | if (error) | 1538 | if (error) |
1541 | xfs_fs_cmn_err(CE_WARN, dqp->q_mount, | 1539 | xfs_fs_cmn_err(CE_WARN, dqp->q_mount, |