diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-03-13 23:15:28 -0700 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2018-03-14 11:12:52 -0700 |
| commit | 656de4ffaffd921e1b45de4150c86ba50da135e9 (patch) | |
| tree | 28fb961b39e2acd26718987dc3ba195251b294e1 /fs/xfs/xfs_log.c | |
| parent | 60e5bb7844ec75a2f54ea76d8ceec5c79172ce7e (diff) | |
| download | linux-656de4ffaffd921e1b45de4150c86ba50da135e9.tar.bz2 | |
xfs: merge _xfs_log_force_lsn and xfs_log_force_lsn
Switch to a single interface for flushing the log to a specific LSN, which
gives consistent trace point coverage and a less confusing interface.
The was only a single user of the previous xfs_log_force_lsn function,
which now also passes a NULL log_flushed argument.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/xfs/xfs_log.c')
| -rw-r--r-- | fs/xfs/xfs_log.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 3ce17e79b6e0..cb50dd72a3f3 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -3429,7 +3429,7 @@ no_sleep: * sv. */ int -_xfs_log_force_lsn( +xfs_log_force_lsn( struct xfs_mount *mp, xfs_lsn_t lsn, uint flags, @@ -3442,6 +3442,7 @@ _xfs_log_force_lsn( ASSERT(lsn != 0); XFS_STATS_INC(mp, xs_log_force); + trace_xfs_log_force(mp, lsn, _RET_IP_); lsn = xlog_cil_force_lsn(log, lsn); if (lsn == NULLCOMMITLSN) @@ -3539,21 +3540,6 @@ try_again: } /* - * Wrapper for _xfs_log_force_lsn(), to be used when caller doesn't care - * about errors or whether the log was flushed or not. This is the normal - * interface to use when trying to unpin items or move the log forward. - */ -void -xfs_log_force_lsn( - xfs_mount_t *mp, - xfs_lsn_t lsn, - uint flags) -{ - trace_xfs_log_force(mp, lsn, _RET_IP_); - _xfs_log_force_lsn(mp, lsn, flags, NULL); -} - -/* * Called when we want to mark the current iclog as being ready to sync to * disk. */ |