libxfs: determine inode size from version number, not struct xfs_dinode

xfs_db does not use the same structure types as libxfs when checking
inodes, and so cannot determine the size of the inode core by
passing a struct xfs_dinode to a function. We do, however, know the
raw version number, so we can pass that instead. Convert the code to
passing the inode version rather than a structure.

Note that this should probably be converted in the kernel code as
well.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

diff --git a/include/xfs_inode.h b/include/xfs_inode.h
index cc14743160c8d220e6b92f261c7830ed58daba1c..fdca7f7694cba9886902747eb033c16b0ed86397 100644 (file)
--- a/include/xfs_inode.h
+++ b/include/xfs_inode.h
@@ -169,9 +169,9 @@ typedef struct xfs_icdinode {
        /* structure must be padded to 64 bit alignment */
 } xfs_icdinode_t;
 
-static inline uint xfs_icdinode_size(struct xfs_icdinode *dicp)
+static inline uint xfs_icdinode_size(int version)
 {
-       if (dicp->di_version == 3)
+       if (version == 3)
                return sizeof(struct xfs_icdinode);
        return offsetof(struct xfs_icdinode, di_next_unlinked);
 }

diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index 30108718bf5088e19c8343c0d41d73ff9ddd6365..a369e72571772a0e70c5e51cd979eb92d5b6e1e5 100644 (file)
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -655,7 +655,7 @@ xlog_print_trans_inode(xfs_caddr_t *ptr,
     mode = dino.di_mode & S_IFMT;
     size = (int)dino.di_size;
     xlog_print_trans_inode_core(&dino);
-    *ptr += xfs_icdinode_size(&dino);
+    *ptr += xfs_icdinode_size(dino.di_version);
 
     if (*i == num_ops-1 && f->ilf_size == 3)  {
        return 1;

diff --git a/logprint/log_print_all.c b/logprint/log_print_all.c
index 70b09057b641067f134caf280eaab055e3739ec9..462618623ba5c8de2b138c419b87e643970e017d 100644 (file)
--- a/logprint/log_print_all.c
+++ b/logprint/log_print_all.c
@@ -295,8 +295,8 @@ xlog_recover_print_inode(
               f->ilf_dsize);
 
        /* core inode comes 2nd */
-       ASSERT(item->ri_buf[1].i_len == xfs_icdinode_size((xfs_icdinode_t *)
-                                                       item->ri_buf[1].i_addr));
+       ASSERT(item->ri_buf[1].i_len == xfs_icdinode_size(1) ||
+               item->ri_buf[1].i_len == xfs_icdinode_size(3));
        xlog_recover_print_inode_core((xfs_icdinode_t *)
                                      item->ri_buf[1].i_addr);
 

diff --git a/repair/phase6.c b/repair/phase6.c
index dc8145bba57fa3b11a06bd6710d4721b0c6e1b8b..09052cc15a3b97f3fc1002e3053d24f0cd67ab63 100644 (file)
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -446,8 +446,7 @@ mk_rbmino(xfs_mount_t *mp)
        }
 
        vers = xfs_sb_version_hascrc(&mp->m_sb) ? 3 : 1;
-       ip->i_d.di_version = vers;
-       memset(&ip->i_d, 0, xfs_icdinode_size(&ip->i_d));
+       memset(&ip->i_d, 0, xfs_icdinode_size(vers));
 
        ip->i_d.di_magic = XFS_DINODE_MAGIC;
        ip->i_d.di_mode = S_IFREG;
@@ -696,8 +695,7 @@ mk_rsumino(xfs_mount_t *mp)
        }
 
        vers = xfs_sb_version_hascrc(&mp->m_sb) ? 3 : 1;
-       ip->i_d.di_version = vers;
-       memset(&ip->i_d, 0, xfs_icdinode_size(&ip->i_d));
+       memset(&ip->i_d, 0, xfs_icdinode_size(vers));
 
        ip->i_d.di_magic = XFS_DINODE_MAGIC;
        ip->i_d.di_mode = S_IFREG;
@@ -813,8 +811,7 @@ mk_root_dir(xfs_mount_t *mp)
         * take care of the core -- initialization from xfs_ialloc()
         */
        vers = xfs_sb_version_hascrc(&mp->m_sb) ? 3 : 1;
-       ip->i_d.di_version = vers;
-       memset(&ip->i_d, 0, xfs_icdinode_size(&ip->i_d));
+       memset(&ip->i_d, 0, xfs_icdinode_size(vers));
 
        ip->i_d.di_magic = XFS_DINODE_MAGIC;
        ip->i_d.di_mode = (__uint16_t) mode|S_IFDIR;