xfs: refactor log recovery check

Add a predicate to decide if the log is actively in recovery and use
that instead of open-coding a pagf_init check in the attr leaf verifier.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
index 4e7ef79..6fc5425 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr_leaf.c
+++ b/fs/xfs/libxfs/xfs_attr_leaf.c
@@ -242,7 +242,6 @@ xfs_attr3_leaf_verify(
        struct xfs_attr3_icleaf_hdr     ichdr;
        struct xfs_mount                *mp = bp->b_target->bt_mount;
        struct xfs_attr_leafblock       *leaf = bp->b_addr;
-       struct xfs_perag                *pag = bp->b_pag;
        struct xfs_attr_leaf_entry      *entries;
        uint16_t                        end;
        int                             i;
@@ -270,7 +269,7 @@ xfs_attr3_leaf_verify(
         * because we may have transitioned an empty shortform attr to a leaf
         * if the attr didn't fit in shortform.
         */
-       if (pag && pag->pagf_init && ichdr.count == 0)
+       if (!xfs_log_in_recovery(mp) && ichdr.count == 0)
                return __this_address;
 
        /*

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index fd10b14..00df4f3 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -4104,3 +4104,12 @@ xfs_log_check_lsn(
 
        return valid;
 }
+
+bool
+xfs_log_in_recovery(
+       struct xfs_mount        *mp)
+{
+       struct xlog             *log = mp->m_log;
+
+       return log->l_flags & XLOG_ACTIVE_RECOVERY;
+}

diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
index 3c1f6a8..73a64bf 100644 (file)
--- a/fs/xfs/xfs_log.h
+++ b/fs/xfs/xfs_log.h
@@ -153,5 +153,6 @@ bool        xfs_log_item_in_current_chkpt(struct xfs_log_item *lip);
 void   xfs_log_work_queue(struct xfs_mount *mp);
 void   xfs_log_quiesce(struct xfs_mount *mp);
 bool   xfs_log_check_lsn(struct xfs_mount *, xfs_lsn_t);
+bool   xfs_log_in_recovery(struct xfs_mount *);
 
 #endif /* __XFS_LOG_H__ */