[XFS] dinode endianess annotations

Biggest bit is duplicating the dinode structure so we have one annotated for
native endianess and one for disk endianess. The other significant change
is that xfs_xlate_dinode_core is split into one helper per direction to
allow for proper annotations, everything else is trivial.

As a sidenode splitting out the incore dinode means we can move it into
xfs_inode.h in a later patch and severely improving on the include hell in
xfs.

SGI-PV: 968563
SGI-Modid: xfs-linux-melb:xfs-kern:29476a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 32 insertions, 33 deletions

diff --git a/fs/xfs/xfs_dinode.h b/fs/xfs/xfs_dinode.h
index fefd0116bac9..dedd713574e1 100644
--- a/fs/xfs/xfs_dinode.h
+++ b/fs/xfs/xfs_dinode.h
@@ -34,41 +34,41 @@ struct xfs_mount;
  * because we only need the core part in the in-core inode.
  */
 typedef struct xfs_timestamp {
-        __int32_t       t_sec;          /* timestamp seconds */
-        __int32_t       t_nsec;         /* timestamp nanoseconds */
+        __be32          t_sec;          /* timestamp seconds */
+        __be32          t_nsec;         /* timestamp nanoseconds */
 } xfs_timestamp_t;
 
 /*
  * Note: Coordinate changes to this structure with the XFS_DI_* #defines
- * below and the offsets table in xfs_ialloc_log_di().
+ * below, the offsets table in xfs_ialloc_log_di() and struct xfs_icdinode
+ * in xfs_inode.h.
  */
-typedef struct xfs_dinode_core
-{
-        __uint16_t      di_magic;       /* inode magic # = XFS_DINODE_MAGIC */
-        __uint16_t      di_mode;        /* mode and type of file */
-        __int8_t        di_version;     /* inode version */
-        __int8_t        di_format;      /* format of di_c data */
-        __uint16_t      di_onlink;      /* old number of links to file */
-        __uint32_t      di_uid;         /* owner's user id */
-        __uint32_t      di_gid;         /* owner's group id */
-        __uint32_t      di_nlink;       /* number of links to file */
-        __uint16_t      di_projid;      /* owner's project id */
-        __uint8_t       di_pad[8];      /* unused, zeroed space */
-        __uint16_t      di_flushiter;   /* incremented on flush */
+typedef struct xfs_dinode_core {
+        __be16          di_magic;       /* inode magic # = XFS_DINODE_MAGIC */
+        __be16          di_mode;        /* mode and type of file */
+        __u8            di_version;     /* inode version */
+        __u8            di_format;      /* format of di_c data */
+        __be16          di_onlink;      /* old number of links to file */
+        __be32          di_uid;         /* owner's user id */
+        __be32          di_gid;         /* owner's group id */
+        __be32          di_nlink;       /* number of links to file */
+        __be16          di_projid;      /* owner's project id */
+        __u8            di_pad[8];      /* unused, zeroed space */
+        __be16          di_flushiter;   /* incremented on flush */
         xfs_timestamp_t di_atime;       /* time last accessed */
         xfs_timestamp_t di_mtime;       /* time last modified */
         xfs_timestamp_t di_ctime;       /* time created/inode modified */
-        xfs_fsize_t     di_size;        /* number of bytes in file */
-        xfs_drfsbno_t   di_nblocks;     /* # of direct & btree blocks used */
-        xfs_extlen_t    di_extsize;     /* basic/minimum extent size for file */
-        xfs_extnum_t    di_nextents;    /* number of extents in data fork */
-        xfs_aextnum_t   di_anextents;   /* number of extents in attribute fork*/
-        __uint8_t       di_forkoff;     /* attr fork offs, <<3 for 64b align */
-        __int8_t        di_aformat;     /* format of attr fork's data */
-        __uint32_t      di_dmevmask;    /* DMIG event mask */
-        __uint16_t      di_dmstate;     /* DMIG state info */
-        __uint16_t      di_flags;       /* random flags, XFS_DIFLAG_... */
-        __uint32_t      di_gen;         /* generation number */
+        __be64          di_size;        /* number of bytes in file */
+        __be64          di_nblocks;     /* # of direct & btree blocks used */
+        __be32          di_extsize;     /* basic/minimum extent size for file */
+        __be32          di_nextents;    /* number of extents in data fork */
+        __be16          di_anextents;   /* number of extents in attribute fork*/
+        __u8            di_forkoff;     /* attr fork offs, <<3 for 64b align */
+        __s8            di_aformat;     /* format of attr fork's data */
+        __be32          di_dmevmask;    /* DMIG event mask */
+        __be16          di_dmstate;     /* DMIG state info */
+        __be16          di_flags;       /* random flags, XFS_DIFLAG_... */
+        __be32          di_gen;         /* generation number */
 } xfs_dinode_core_t;
 
 #define DI_MAX_FLUSH 0xffff
@@ -81,13 +81,13 @@ typedef struct xfs_dinode
          * sure to update the macros like XFS_LITINO below and
          * XFS_BMAP_RBLOCK_DSIZE in xfs_bmap_btree.h.
          */
-        xfs_agino_t             di_next_unlinked;/* agi unlinked list ptr */
+        __be32                  di_next_unlinked;/* agi unlinked list ptr */
         union {
                 xfs_bmdr_block_t di_bmbt;       /* btree root block */
                 xfs_bmbt_rec_32_t di_bmx[1];    /* extent list */
                 xfs_dir2_sf_t   di_dir2sf;      /* shortform directory v2 */
                 char            di_c[1];        /* local contents */
-                xfs_dev_t       di_dev;         /* device for S_IFCHR/S_IFBLK */
+                __be32          di_dev;         /* device for S_IFCHR/S_IFBLK */
                 uuid_t          di_muuid;       /* mount point value */
                 char            di_symlink[1];  /* local symbolic link */
         }               di_u;
@@ -175,8 +175,7 @@ typedef enum xfs_dinode_fmt
 #define XFS_CFORK_Q_DISK(dcp)               ((dcp)->di_forkoff != 0)
 
 #define XFS_CFORK_BOFF(dcp)                 ((int)((dcp)->di_forkoff << 3))
-#define XFS_CFORK_BOFF_DISK(dcp) \
-        ((int)(INT_GET((dcp)->di_forkoff, ARCH_CONVERT) << 3))
+#define XFS_CFORK_BOFF_DISK(dcp)            ((int)((dcp)->di_forkoff << 3))
 
 #define XFS_CFORK_DSIZE_DISK(dcp,mp) \
         (XFS_CFORK_Q_DISK(dcp) ? XFS_CFORK_BOFF_DISK(dcp) : XFS_LITINO(mp))
@@ -225,8 +224,8 @@ typedef enum xfs_dinode_fmt
 
 #define XFS_CFORK_NEXTENTS_DISK(dcp,w) \
         ((w) == XFS_DATA_FORK ? \
-                INT_GET((dcp)->di_nextents, ARCH_CONVERT) : \
-                INT_GET((dcp)->di_anextents, ARCH_CONVERT))
+                be32_to_cpu((dcp)->di_nextents) : \
+                be16_to_cpu((dcp)->di_anextents))
 #define XFS_CFORK_NEXTENTS(dcp,w) \
         ((w) == XFS_DATA_FORK ? (dcp)->di_nextents : (dcp)->di_anextents)
 #define XFS_DFORK_NEXTENTS(dip,w) XFS_CFORK_NEXTENTS_DISK(&(dip)->di_core, w)