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>

diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c
index fe1bfee..761f318 100644 (file)
--- a/fs/xfs/xfs_export.c
+++ b/fs/xfs/xfs_export.c
@@ -237,7 +237,7 @@ xfs_fs_nfs_commit_metadata(
 
        if (!lsn)
                return 0;
-       return _xfs_log_force_lsn(mp, lsn, XFS_LOG_SYNC, NULL);
+       return xfs_log_force_lsn(mp, lsn, XFS_LOG_SYNC, NULL);
 }
 
 const struct export_operations xfs_export_operations = {

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 9ea0832..f5c5dbb 100644 (file)
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -122,7 +122,7 @@ xfs_dir_fsync(
 
        if (!lsn)
                return 0;
-       return _xfs_log_force_lsn(mp, lsn, XFS_LOG_SYNC, NULL);
+       return xfs_log_force_lsn(mp, lsn, XFS_LOG_SYNC, NULL);
 }
 
 STATIC int
@@ -182,7 +182,7 @@ xfs_file_fsync(
        }
 
        if (lsn) {
-               error = _xfs_log_force_lsn(mp, lsn, XFS_LOG_SYNC, &log_flushed);
+               error = xfs_log_force_lsn(mp, lsn, XFS_LOG_SYNC, &log_flushed);
                ip->i_itemp->ili_fsync_fields = 0;
        }
        xfs_iunlock(ip, XFS_ILOCK_SHARED);

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 50fbbf5..09ba970 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2502,7 +2502,7 @@ xfs_iunpin(
        trace_xfs_inode_unpin_nowait(ip, _RET_IP_);
 
        /* Give the log a push to start the unpinning I/O */
-       xfs_log_force_lsn(ip->i_mount, ip->i_itemp->ili_last_lsn, 0);
+       xfs_log_force_lsn(ip->i_mount, ip->i_itemp->ili_last_lsn, 0, NULL);
 
 }
 

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 3ce17e7..cb50dd7 100644 (file)
--- 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.
  */

diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
index 726dd9a..7e2d629 100644 (file)
--- a/fs/xfs/xfs_log.h
+++ b/fs/xfs/xfs_log.h
@@ -130,13 +130,8 @@ xfs_lsn_t xfs_log_done(struct xfs_mount *mp,
                       struct xlog_in_core **iclog,
                       bool regrant);
 int      xfs_log_force(struct xfs_mount *mp, uint flags);
-int      _xfs_log_force_lsn(struct xfs_mount *mp,
-                            xfs_lsn_t          lsn,
-                            uint               flags,
-                            int                *log_forced);
-void     xfs_log_force_lsn(struct xfs_mount    *mp,
-                           xfs_lsn_t           lsn,
-                           uint                flags);
+int      xfs_log_force_lsn(struct xfs_mount *mp, xfs_lsn_t lsn, uint flags,
+               int *log_forced);
 int      xfs_log_mount(struct xfs_mount        *mp,
                        struct xfs_buftarg      *log_target,
                        xfs_daddr_t             start_block,

diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 2ad08ec..d6d8f9d 100644 (file)
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -970,7 +970,7 @@ __xfs_trans_commit(
         * log out now and wait for it.
         */
        if (sync) {
-               error = _xfs_log_force_lsn(mp, commit_lsn, XFS_LOG_SYNC, NULL);
+               error = xfs_log_force_lsn(mp, commit_lsn, XFS_LOG_SYNC, NULL);
                XFS_STATS_INC(mp, xs_trans_sync);
        } else {
                XFS_STATS_INC(mp, xs_trans_async);