aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/quota/xfs_dquot_item.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-01-19 04:56:46 -0500
committerAlex Elder <aelder@sgi.com>2010-01-21 14:44:49 -0500
commita14a348bff2f99471a28e5928eb6801224c053d8 (patch)
tree9a34d7e988cd78bc9b19369cbad3ad009b9a2bfd /fs/xfs/quota/xfs_dquot_item.c
parent4139b3b337cffd106744386c842b89dc86e31d4b (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_item.c')
-rw-r--r--fs/xfs/quota/xfs_dquot_item.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/xfs/quota/xfs_dquot_item.c b/fs/xfs/quota/xfs_dquot_item.c
index 116580d52fae..1b564376d50c 100644
--- a/fs/xfs/quota/xfs_dquot_item.c
+++ b/fs/xfs/quota/xfs_dquot_item.c
@@ -190,7 +190,7 @@ xfs_qm_dqunpin_wait(
190 /* 190 /*
191 * Give the log a push so we don't wait here too long. 191 * Give the log a push so we don't wait here too long.
192 */ 192 */
193 xfs_log_force(dqp->q_mount, (xfs_lsn_t)0, XFS_LOG_FORCE); 193 xfs_log_force(dqp->q_mount, 0);
194 wait_event(dqp->q_pinwait, (atomic_read(&dqp->q_pincount) == 0)); 194 wait_event(dqp->q_pinwait, (atomic_read(&dqp->q_pincount) == 0));
195} 195}
196 196
@@ -245,10 +245,9 @@ xfs_qm_dquot_logitem_pushbuf(
245 qip->qli_pushbuf_flag = 0; 245 qip->qli_pushbuf_flag = 0;
246 xfs_dqunlock(dqp); 246 xfs_dqunlock(dqp);
247 247
248 if (XFS_BUF_ISPINNED(bp)) { 248 if (XFS_BUF_ISPINNED(bp))
249 xfs_log_force(mp, (xfs_lsn_t)0, 249 xfs_log_force(mp, 0);
250 XFS_LOG_FORCE); 250
251 }
252 if (dopush) { 251 if (dopush) {
253 int error; 252 int error;
254#ifdef XFSRACEDEBUG 253#ifdef XFSRACEDEBUG