xfs: kill xfs_sb_version_has_v3inode()

Source kernel commit: cf28e17c9186c83e7e8702f844bc40b6e782ce6c

All callers to xfs_dinode_good_version() and XFS_DINODE_SIZE() in
both the kernel and userspace have a xfs_mount structure available
which means they can use mount features checks instead looking
directly are the superblock.

Convert these functions to take a mount and use a xfs_has_v3inodes()
check and move it out of the libxfs/xfs_format.h file as it really
doesn't have anything to do with the definition of the on-disk
format.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/db/check.c b/db/check.c
index a078e948bc8f63d46147a77bb4a8c9ed5b185b35..368f80c0b68f9979f1bcbef05a07cd5a7ccd1823 100644 (file)
--- a/db/check.c
+++ b/db/check.c
@@ -2796,7 +2796,7 @@ process_inode(
                error++;
                return;
        }
-       if (!libxfs_dinode_good_version(&mp->m_sb, dip->di_version)) {
+       if (!libxfs_dinode_good_version(mp, dip->di_version)) {
                if (isfree || v)
                        dbprintf(_("bad version number %#x for inode %lld\n"),
                                dip->di_version, ino);

diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h
index ee479feb32b56f388511ca38cd688c17f56a3493..2d7057b7984b6ef9f95b00d90ac5f76c80b075c9 100644 (file)
--- a/libxfs/xfs_format.h
+++ b/libxfs/xfs_format.h
@@ -414,18 +414,6 @@ xfs_sb_add_incompat_log_features(
 }
 
 
-/*
- * v5 file systems support V3 inodes only, earlier file systems support
- * v2 and v1 inodes.
- */
-static inline bool xfs_dinode_good_version(struct xfs_sb *sbp,
-               uint8_t version)
-{
-       if (xfs_sb_is_v5(sbp))
-               return version == 3;
-       return version == 1 || version == 2;
-}
-
 static inline bool
 xfs_is_quota_inode(struct xfs_sb *sbp, xfs_ino_t ino)
 {
@@ -892,12 +880,12 @@ enum xfs_dinode_fmt {
 /*
  * Inode size for given fs.
  */
-#define XFS_DINODE_SIZE(sbp) \
-       (xfs_sb_is_v5(sbp) ? \
+#define XFS_DINODE_SIZE(mp) \
+       (xfs_has_v3inodes(mp) ? \
                sizeof(struct xfs_dinode) : \
                offsetof(struct xfs_dinode, di_crc))
 #define XFS_LITINO(mp) \
-       ((mp)->m_sb.sb_inodesize - XFS_DINODE_SIZE(&(mp)->m_sb))
+       ((mp)->m_sb.sb_inodesize - XFS_DINODE_SIZE(mp))
 
 /*
  * Inode data & attribute fork sizes, per inode.

diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
index cbccc072ca594e2d30961517c6d6b50af38e3c7f..3b96e828c052409f02460471a633ce9584c64a71 100644 (file)
--- a/libxfs/xfs_ialloc.c
+++ b/libxfs/xfs_ialloc.c
@@ -332,7 +332,6 @@ xfs_ialloc_inode_init(
                xfs_buf_zero(fbuf, 0, BBTOB(fbuf->b_length));
                for (i = 0; i < M_IGEO(mp)->inodes_per_cluster; i++) {
                        int     ioffset = i << mp->m_sb.sb_inodelog;
-                       uint    isize = XFS_DINODE_SIZE(&mp->m_sb);
 
                        free = xfs_make_iptr(mp, fbuf, i);
                        free->di_magic = cpu_to_be16(XFS_DINODE_MAGIC);
@@ -349,7 +348,7 @@ xfs_ialloc_inode_init(
                        } else if (tp) {
                                /* just log the inode core */
                                xfs_trans_log_buf(tp, fbuf, ioffset,
-                                                 ioffset + isize - 1);
+                                         ioffset + XFS_DINODE_SIZE(mp) - 1);
                        }
                }
 

diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c
index 2638e515b52c72e85e5423083339bdc0845bb9eb..dfff59798e4ae95823f3c9a38a1ef90e39650927 100644 (file)
--- a/libxfs/xfs_inode_buf.c
+++ b/libxfs/xfs_inode_buf.c
@@ -55,7 +55,7 @@ xfs_inode_buf_verify(
                dip = xfs_buf_offset(bp, (i << mp->m_sb.sb_inodelog));
                unlinked_ino = be32_to_cpu(dip->di_next_unlinked);
                di_ok = xfs_verify_magic16(bp, dip->di_magic) &&
-                       xfs_dinode_good_version(&mp->m_sb, dip->di_version) &&
+                       xfs_dinode_good_version(mp, dip->di_version) &&
                        xfs_verify_agino_or_null(mp, agno, unlinked_ino);
                if (unlikely(XFS_TEST_ERROR(!di_ok, mp,
                                                XFS_ERRTAG_ITOBP_INOTOBP))) {

diff --git a/libxfs/xfs_inode_buf.h b/libxfs/xfs_inode_buf.h
index 7f865bb4df840b181d28ed487c9698b7cd4ea235..585ed5a110af4e72a65783adf91639cc09686ea7 100644 (file)
--- a/libxfs/xfs_inode_buf.h
+++ b/libxfs/xfs_inode_buf.h
@@ -21,7 +21,7 @@ struct xfs_imap {
 
 int    xfs_imap_to_bp(struct xfs_mount *mp, struct xfs_trans *tp,
                       struct xfs_imap *imap, struct xfs_buf **bpp);
-void   xfs_dinode_calc_crc(struct xfs_mount *, struct xfs_dinode *);
+void   xfs_dinode_calc_crc(struct xfs_mount *mp, struct xfs_dinode *dip);
 void   xfs_inode_to_disk(struct xfs_inode *ip, struct xfs_dinode *to,
                          xfs_lsn_t lsn);
 int    xfs_inode_from_disk(struct xfs_inode *ip, struct xfs_dinode *from);
@@ -42,4 +42,13 @@ static inline uint64_t xfs_inode_encode_bigtime(struct timespec64 tv)
 struct timespec64 xfs_inode_from_disk_ts(struct xfs_dinode *dip,
                const xfs_timestamp_t ts);
 
+static inline bool
+xfs_dinode_good_version(struct xfs_mount *mp, uint8_t version)
+{
+       if (xfs_has_v3inodes(mp))
+               return version == 3;
+       return version == 1 || version == 2;
+}
+
+
 #endif /* __XFS_INODE_BUF_H__ */

diff --git a/repair/dinode.c b/repair/dinode.c
index 3a79e18ebdb946e7eb3424e433e2e0622a9f818f..4da39dccf6b2b5b148c76b0f96c79a7e504d0bc4 100644 (file)
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -2329,7 +2329,7 @@ process_dinode_int(xfs_mount_t *mp,
                }
        }
 
-       if (!libxfs_dinode_good_version(&mp->m_sb, dino->di_version)) {
+       if (!libxfs_dinode_good_version(mp, dino->di_version)) {
                retval = 1;
                if (!uncertain)
                        do_warn(_("bad version number 0x%x on inode %" PRIu64 "%c"),

diff --git a/repair/prefetch.c b/repair/prefetch.c
index 22a0c0c902d9781ae02b4ead39a3a4aa15d4cb92..b5266b8fceaba62dc849bf1783d5552eec0c7823 100644 (file)
--- a/repair/prefetch.c
+++ b/repair/prefetch.c
@@ -441,7 +441,7 @@ pf_read_inode_dirs(
                if (be16_to_cpu(dino->di_magic) != XFS_DINODE_MAGIC)
                        continue;
 
-               if (!libxfs_dinode_good_version(&mp->m_sb, dino->di_version))
+               if (!libxfs_dinode_good_version(mp, dino->di_version))
                        continue;
 
                if (be64_to_cpu(dino->di_size) <= XFS_DFORK_DSIZE(dino, mp))