Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit

[deliverable/linux.git] / fs / freevxfs / vxfs_olt.h

diff --git a/fs/freevxfs/vxfs_olt.h b/fs/freevxfs/vxfs_olt.h
index b7b3af50261583f3c0f86b7fdc4328a0f833bd11..0c0b0c9fa5579b4b54ccb67c5bf3b214916ac767 100644 (file)
--- a/fs/freevxfs/vxfs_olt.h
+++ b/fs/freevxfs/vxfs_olt.h
@@ -63,83 +63,83 @@ enum {
  * the initial inode list, the fileset header or the device configuration.
  */
 struct vxfs_olt {
-       u_int32_t       olt_magic;      /* magic number                 */
-       u_int32_t       olt_size;       /* size of this entry           */
-       u_int32_t       olt_checksum;   /* checksum of extent           */
-       u_int32_t       __unused1;      /* ???                          */
-       u_int32_t       olt_mtime;      /* time of last mod. (sec)      */
-       u_int32_t       olt_mutime;     /* time of last mod. (usec)     */
-       u_int32_t       olt_totfree;    /* free space in OLT extent     */
-       vx_daddr_t      olt_extents[2]; /* addr of this extent, replica */
-       u_int32_t       olt_esize;      /* size of this extent          */
-       vx_daddr_t      olt_next[2];    /* addr of next extent, replica */
-       u_int32_t       olt_nsize;      /* size of next extent          */
-       u_int32_t       __unused2;      /* align to 8 byte boundary     */
+       __fs32          olt_magic;      /* magic number                 */
+       __fs32          olt_size;       /* size of this entry           */
+       __fs32          olt_checksum;   /* checksum of extent           */
+       __u32           __unused1;      /* ???                          */
+       __fs32          olt_mtime;      /* time of last mod. (sec)      */
+       __fs32          olt_mutime;     /* time of last mod. (usec)     */
+       __fs32          olt_totfree;    /* free space in OLT extent     */
+       __fs32          olt_extents[2]; /* addr of this extent, replica */
+       __fs32          olt_esize;      /* size of this extent          */
+       __fs32          olt_next[2];    /* addr of next extent, replica */
+       __fs32          olt_nsize;      /* size of next extent          */
+       __u32           __unused2;      /* align to 8 byte boundary     */
 };
 
 /*
  * VxFS common OLT entry (on disk).
  */
 struct vxfs_oltcommon {
-       u_int32_t       olt_type;       /* type of this record          */
-       u_int32_t       olt_size;       /* size of this record          */
+       __fs32          olt_type;       /* type of this record          */
+       __fs32          olt_size;       /* size of this record          */
 };
 
 /*
  * VxFS free OLT entry (on disk).
  */
 struct vxfs_oltfree {
-       u_int32_t       olt_type;       /* type of this record          */
-       u_int32_t       olt_fsize;      /* size of this free record     */
+       __fs32          olt_type;       /* type of this record          */
+       __fs32          olt_fsize;      /* size of this free record     */
 };
 
 /*
  * VxFS initial-inode list (on disk).
  */
 struct vxfs_oltilist {
-       u_int32_t       olt_type;       /* type of this record          */
-       u_int32_t       olt_size;       /* size of this record          */
-       vx_ino_t        olt_iext[2];    /* initial inode list, replica  */
+       __fs32  olt_type;       /* type of this record          */
+       __fs32  olt_size;       /* size of this record          */
+       __fs32          olt_iext[2];    /* initial inode list, replica  */
 };
 
 /*
  * Current Usage Table 
  */
 struct vxfs_oltcut {
-       u_int32_t       olt_type;       /* type of this record          */
-       u_int32_t       olt_size;       /* size of this record          */
-       vx_ino_t        olt_cutino;     /* inode of current usage table */
-       u_int32_t       __pad;          /* unused, 8 byte align         */
+       __fs32          olt_type;       /* type of this record          */
+       __fs32          olt_size;       /* size of this record          */
+       __fs32          olt_cutino;     /* inode of current usage table */
+       __u8            __pad;          /* unused, 8 byte align         */
 };
 
 /*
  * Inodes containing Superblock, Intent log and OLTs 
  */
 struct vxfs_oltsb {
-       u_int32_t       olt_type;       /* type of this record          */
-       u_int32_t       olt_size;       /* size of this record          */
-       vx_ino_t        olt_sbino;      /* inode of superblock file     */
-       u_int32_t       __unused1;      /* ???                          */
-       vx_ino_t        olt_logino[2];  /* inode of log file,replica    */
-       vx_ino_t        olt_oltino[2];  /* inode of OLT, replica        */
+       __fs32          olt_type;       /* type of this record          */
+       __fs32          olt_size;       /* size of this record          */
+       __fs32          olt_sbino;      /* inode of superblock file     */
+       __u32           __unused1;      /* ???                          */
+       __fs32          olt_logino[2];  /* inode of log file,replica    */
+       __fs32          olt_oltino[2];  /* inode of OLT, replica        */
 };
 
 /*
  * Inode containing device configuration + it's replica 
  */
 struct vxfs_oltdev {
-       u_int32_t       olt_type;       /* type of this record          */
-       u_int32_t       olt_size;       /* size of this record          */
-       vx_ino_t        olt_devino[2];  /* inode of device config files */
+       __fs32          olt_type;       /* type of this record          */
+       __fs32          olt_size;       /* size of this record          */
+       __fs32          olt_devino[2];  /* inode of device config files */
 };
 
 /*
  * Fileset header 
  */
 struct vxfs_oltfshead {
-       u_int32_t       olt_type;       /* type number                  */
-       u_int32_t       olt_size;       /* size of this record          */
-       vx_ino_t        olt_fsino[2];   /* inodes of fileset header     */
+       __fs32          olt_type;       /* type number                  */
+       __fs32          olt_size;       /* size of this record          */
+       __fs32          olt_fsino[2];   /* inodes of fileset header     */
 };
 
 #endif /* _VXFS_OLT_H_ */