xfs: factor out a xlog_buf_readahead helper

Add a little helper to readahead a buffer if it hasn't been cancelled.

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_log_recover.c b/fs/xfs/xfs_log_recover.c
index 5a4bab6954396bbb203d0cd8010f202bd7f44ec0..3a865f9aef905aef31bf09f163b7411503e6f422 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2034,6 +2034,17 @@ xlog_put_buffer_cancelled(
        return true;
 }
 
+static void
+xlog_buf_readahead(
+       struct xlog             *log,
+       xfs_daddr_t             blkno,
+       uint                    len,
+       const struct xfs_buf_ops *ops)
+{
+       if (!xlog_is_buffer_cancelled(log, blkno, len))
+               xfs_buf_readahead(log->l_mp->m_ddev_targp, blkno, len, ops);
+}
+
 /*
  * Perform recovery for a buffer full of inodes.  In these buffers, the only
  * data which should be recovered is that which corresponds to the
@@ -3870,12 +3881,8 @@ xlog_recover_buffer_ra_pass2(
        struct xlog_recover_item        *item)
 {
        struct xfs_buf_log_format       *buf_f = item->ri_buf[0].i_addr;
-       struct xfs_mount                *mp = log->l_mp;
 
-       if (xlog_is_buffer_cancelled(log, buf_f->blf_blkno, buf_f->blf_len))
-               return;
-       xfs_buf_readahead(mp->m_ddev_targp, buf_f->blf_blkno,
-                               buf_f->blf_len, NULL);
+       xlog_buf_readahead(log, buf_f->blf_blkno, buf_f->blf_len, NULL);
 }
 
 STATIC void
@@ -3885,7 +3892,6 @@ xlog_recover_inode_ra_pass2(
 {
        struct xfs_inode_log_format     ilf_buf;
        struct xfs_inode_log_format     *ilfp;
-       struct xfs_mount                *mp = log->l_mp;
        int                     error;
 
        if (item->ri_buf[0].i_len == sizeof(struct xfs_inode_log_format)) {
@@ -3898,10 +3904,8 @@ xlog_recover_inode_ra_pass2(
                        return;
        }
 
-       if (xlog_is_buffer_cancelled(log, ilfp->ilf_blkno, ilfp->ilf_len))
-               return;
-       xfs_buf_readahead(mp->m_ddev_targp, ilfp->ilf_blkno,
-                               ilfp->ilf_len, &xfs_inode_buf_ra_ops);
+       xlog_buf_readahead(log, ilfp->ilf_blkno, ilfp->ilf_len,
+                          &xfs_inode_buf_ra_ops);
 }
 
 STATIC void
@@ -3913,8 +3917,6 @@ xlog_recover_dquot_ra_pass2(
        struct xfs_disk_dquot   *recddq;
        struct xfs_dq_logformat *dq_f;
        uint                    type;
-       int                     len;
-
 
        if (mp->m_qflags == 0)
                return;
@@ -3934,11 +3936,9 @@ xlog_recover_dquot_ra_pass2(
        ASSERT(dq_f);
        ASSERT(dq_f->qlf_len == 1);
 
-       len = XFS_FSB_TO_BB(mp, dq_f->qlf_len);
-       if (xlog_is_buffer_cancelled(log, dq_f->qlf_blkno, len))
-               return;
-       xfs_buf_readahead(mp->m_ddev_targp, dq_f->qlf_blkno, len,
-                         &xfs_dquot_buf_ra_ops);
+       xlog_buf_readahead(log, dq_f->qlf_blkno,
+                       XFS_FSB_TO_BB(mp, dq_f->qlf_len),
+                       &xfs_dquot_buf_ra_ops);
 }
 
 STATIC void