1 files changed, 21 insertions, 21 deletions
diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h
index fc763a8334ac..82a08baf437b 100644
--- a/fs/xfs/xfs_quota.h
+++ b/fs/xfs/xfs_quota.h
@@ -45,28 +45,28 @@ typedef __uint16_t	xfs_qwarncnt_t;
 * to construct the on disk structure.
 */
 typedef struct  xfs_disk_dquot {
-/*16*/  u_int16_t       d_magic;        /* dquot magic = XFS_DQUOT_MAGIC */
+        __be16          d_magic;        /* dquot magic = XFS_DQUOT_MAGIC */
-/*8 */  u_int8_t        d_version;      /* dquot version */
+        __u8            d_version;      /* dquot version */
-/*8 */  u_int8_t        d_flags;        /* XFS_DQ_USER/PROJ/GROUP */
+        __u8            d_flags;        /* XFS_DQ_USER/PROJ/GROUP */
-/*32*/  xfs_dqid_t      d_id;           /* user,project,group id */
+        __be32          d_id;           /* user,project,group id */
-/*64*/  xfs_qcnt_t      d_blk_hardlimit;/* absolute limit on disk blks */
+        __be64          d_blk_hardlimit;/* absolute limit on disk blks */
-/*64*/  xfs_qcnt_t      d_blk_softlimit;/* preferred limit on disk blks */
+        __be64          d_blk_softlimit;/* preferred limit on disk blks */
-/*64*/  xfs_qcnt_t      d_ino_hardlimit;/* maximum # allocated inodes */
+        __be64          d_ino_hardlimit;/* maximum # allocated inodes */
-/*64*/  xfs_qcnt_t      d_ino_softlimit;/* preferred inode limit */
+        __be64          d_ino_softlimit;/* preferred inode limit */
-/*64*/  xfs_qcnt_t      d_bcount;       /* disk blocks owned by the user */
+        __be64          d_bcount;       /* disk blocks owned by the user */
-/*64*/  xfs_qcnt_t      d_icount;       /* inodes owned by the user */
+        __be64          d_icount;       /* inodes owned by the user */
-/*32*/  __int32_t       d_itimer;       /* zero if within inode limits if not,
+        __be32          d_itimer;       /* zero if within inode limits if not,
                                           this is when we refuse service */
-/*32*/  __int32_t       d_btimer;       /* similar to above; for disk blocks */
+        __be32          d_btimer;       /* similar to above; for disk blocks */
-/*16*/  xfs_qwarncnt_t  d_iwarns;       /* warnings issued wrt num inodes */
+        __be16          d_iwarns;       /* warnings issued wrt num inodes */
-/*16*/  xfs_qwarncnt_t  d_bwarns;       /* warnings issued wrt disk blocks */
+        __be16          d_bwarns;       /* warnings issued wrt disk blocks */
-/*32*/  __int32_t       d_pad0;         /* 64 bit align */
+        __be32          d_pad0;         /* 64 bit align */
-/*64*/  xfs_qcnt_t      d_rtb_hardlimit;/* absolute limit on realtime blks */
+        __be64          d_rtb_hardlimit;/* absolute limit on realtime blks */
-/*64*/  xfs_qcnt_t      d_rtb_softlimit;/* preferred limit on RT disk blks */
+        __be64          d_rtb_softlimit;/* preferred limit on RT disk blks */
-/*64*/  xfs_qcnt_t      d_rtbcount;     /* realtime blocks owned */
+        __be64          d_rtbcount;     /* realtime blocks owned */
-/*32*/  __int32_t       d_rtbtimer;     /* similar to above; for RT disk blocks */
+        __be32          d_rtbtimer;     /* similar to above; for RT disk blocks */
-/*16*/  xfs_qwarncnt_t  d_rtbwarns;     /* warnings issued wrt RT disk blocks */
+        __be16          d_rtbwarns;     /* warnings issued wrt RT disk blocks */
-/*16*/  __uint16_t      d_pad;
+        __be16          d_pad;
 } xfs_disk_dquot_t;
 /*

diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h index fc763a8334ac..82a08baf437b 100644 --- a/fs/xfs/xfs_quota.h +++ b/fs/xfs/xfs_quota.h
@@ -45,28 +45,28 @@ typedef __uint16_t xfs_qwarncnt_t;
45	* to construct the on disk structure.	45	* to construct the on disk structure.
46	*/	46	*/
47	typedef struct xfs_disk_dquot {	47	typedef struct xfs_disk_dquot {
48	/16/ u_int16_t d_magic; /* dquot magic = XFS_DQUOT_MAGIC */	48	__be16 d_magic; /* dquot magic = XFS_DQUOT_MAGIC */
49	/8 / u_int8_t d_version; /* dquot version */	49	__u8 d_version; /* dquot version */
50	/8 / u_int8_t d_flags; /* XFS_DQ_USER/PROJ/GROUP */	50	__u8 d_flags; /* XFS_DQ_USER/PROJ/GROUP */
51	/32/ xfs_dqid_t d_id; /* user,project,group id */	51	__be32 d_id; /* user,project,group id */
52	/64/ xfs_qcnt_t d_blk_hardlimit;/* absolute limit on disk blks */	52	__be64 d_blk_hardlimit;/* absolute limit on disk blks */
53	/64/ xfs_qcnt_t d_blk_softlimit;/* preferred limit on disk blks */	53	__be64 d_blk_softlimit;/* preferred limit on disk blks */
54	/64/ xfs_qcnt_t d_ino_hardlimit;/* maximum # allocated inodes */	54	__be64 d_ino_hardlimit;/* maximum # allocated inodes */
55	/64/ xfs_qcnt_t d_ino_softlimit;/* preferred inode limit */	55	__be64 d_ino_softlimit;/* preferred inode limit */
56	/64/ xfs_qcnt_t d_bcount; /* disk blocks owned by the user */	56	__be64 d_bcount; /* disk blocks owned by the user */
57	/64/ xfs_qcnt_t d_icount; /* inodes owned by the user */	57	__be64 d_icount; /* inodes owned by the user */
58	/32/ __int32_t d_itimer; /* zero if within inode limits if not,	58	__be32 d_itimer; /* zero if within inode limits if not,
59	this is when we refuse service */	59	this is when we refuse service */
60	/32/ __int32_t d_btimer; /* similar to above; for disk blocks */	60	__be32 d_btimer; /* similar to above; for disk blocks */
61	/16/ xfs_qwarncnt_t d_iwarns; /* warnings issued wrt num inodes */	61	__be16 d_iwarns; /* warnings issued wrt num inodes */
62	/16/ xfs_qwarncnt_t d_bwarns; /* warnings issued wrt disk blocks */	62	__be16 d_bwarns; /* warnings issued wrt disk blocks */
63	/32/ __int32_t d_pad0; /* 64 bit align */	63	__be32 d_pad0; /* 64 bit align */
64	/64/ xfs_qcnt_t d_rtb_hardlimit;/* absolute limit on realtime blks */	64	__be64 d_rtb_hardlimit;/* absolute limit on realtime blks */
65	/64/ xfs_qcnt_t d_rtb_softlimit;/* preferred limit on RT disk blks */	65	__be64 d_rtb_softlimit;/* preferred limit on RT disk blks */
66	/64/ xfs_qcnt_t d_rtbcount; /* realtime blocks owned */	66	__be64 d_rtbcount; /* realtime blocks owned */
67	/32/ __int32_t d_rtbtimer; /* similar to above; for RT disk blocks */	67	__be32 d_rtbtimer; /* similar to above; for RT disk blocks */
68	/16/ xfs_qwarncnt_t d_rtbwarns; /* warnings issued wrt RT disk blocks */	68	__be16 d_rtbwarns; /* warnings issued wrt RT disk blocks */
69	/16/ __uint16_t d_pad;	69	__be16 d_pad;
70	} xfs_disk_dquot_t;	70	} xfs_disk_dquot_t;
71		71
72	/*	72	/*