aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/xfs_log.c')
-rw-r--r--fs/xfs/xfs_log.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 430a8fc02c1f..ba8e36e0b4e7 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -3002,7 +3002,8 @@ _xfs_log_force(
3002 3002
3003 XFS_STATS_INC(xs_log_force); 3003 XFS_STATS_INC(xs_log_force);
3004 3004
3005 xlog_cil_push(log, 1); 3005 if (log->l_cilp)
3006 xlog_cil_force(log);
3006 3007
3007 spin_lock(&log->l_icloglock); 3008 spin_lock(&log->l_icloglock);
3008 3009
@@ -3154,7 +3155,7 @@ _xfs_log_force_lsn(
3154 XFS_STATS_INC(xs_log_force); 3155 XFS_STATS_INC(xs_log_force);
3155 3156
3156 if (log->l_cilp) { 3157 if (log->l_cilp) {
3157 lsn = xlog_cil_push_lsn(log, lsn); 3158 lsn = xlog_cil_force_lsn(log, lsn);
3158 if (lsn == NULLCOMMITLSN) 3159 if (lsn == NULLCOMMITLSN)
3159 return 0; 3160 return 0;
3160 } 3161 }
@@ -3711,7 +3712,7 @@ xfs_log_force_umount(
3711 * call below. 3712 * call below.
3712 */ 3713 */
3713 if (!logerror && (mp->m_flags & XFS_MOUNT_DELAYLOG)) 3714 if (!logerror && (mp->m_flags & XFS_MOUNT_DELAYLOG))
3714 xlog_cil_push(log, 1); 3715 xlog_cil_force(log);
3715 3716
3716 /* 3717 /*
3717 * We must hold both the GRANT lock and the LOG lock, 3718 * We must hold both the GRANT lock and the LOG lock,