1 files changed, 33 insertions, 47 deletions

diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h
index 32cb79752d5d..82a08baf437b 100644
--- a/fs/xfs/xfs_quota.h
+++ b/fs/xfs/xfs_quota.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2005 Silicon Graphics, Inc.
+ * All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation.
  *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #ifndef __XFS_QUOTA_H__
 #define __XFS_QUOTA_H__
@@ -42,7 +28,7 @@
  * uid_t and gid_t are hard-coded to 32 bits in the inode.
  * Hence, an 'id' in a dquot is 32 bits..
  */
-typedef __int32_t       xfs_dqid_t;
+typedef __uint32_t      xfs_dqid_t;
 
 /*
  * Eventhough users may not have quota limits occupying all 64-bits,
@@ -59,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 */
-/*8 */  u_int8_t        d_version;      /* dquot version */
-/*8 */  u_int8_t        d_flags;        /* XFS_DQ_USER/PROJ/GROUP */
-/*32*/  xfs_dqid_t      d_id;           /* user,project,group id */
-/*64*/  xfs_qcnt_t      d_blk_hardlimit;/* absolute limit on disk blks */
-/*64*/  xfs_qcnt_t      d_blk_softlimit;/* preferred limit on disk blks */
-/*64*/  xfs_qcnt_t      d_ino_hardlimit;/* maximum # allocated inodes */
-/*64*/  xfs_qcnt_t      d_ino_softlimit;/* preferred inode limit */
-/*64*/  xfs_qcnt_t      d_bcount;       /* disk blocks owned by the user */
-/*64*/  xfs_qcnt_t      d_icount;       /* inodes owned by the user */
-/*32*/  __int32_t       d_itimer;       /* zero if within inode limits if not,
+        __be16          d_magic;        /* dquot magic = XFS_DQUOT_MAGIC */
+        __u8            d_version;      /* dquot version */
+        __u8            d_flags;        /* XFS_DQ_USER/PROJ/GROUP */
+        __be32          d_id;           /* user,project,group id */
+        __be64          d_blk_hardlimit;/* absolute limit on disk blks */
+        __be64          d_blk_softlimit;/* preferred limit on disk blks */
+        __be64          d_ino_hardlimit;/* maximum # allocated inodes */
+        __be64          d_ino_softlimit;/* preferred inode limit */
+        __be64          d_bcount;       /* disk blocks owned by the user */
+        __be64          d_icount;       /* inodes owned by the user */
+        __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 */
-/*16*/  xfs_qwarncnt_t  d_iwarns;       /* warnings issued wrt num inodes */
-/*16*/  xfs_qwarncnt_t  d_bwarns;       /* warnings issued wrt disk blocks */
-/*32*/  __int32_t       d_pad0;         /* 64 bit align */
-/*64*/  xfs_qcnt_t      d_rtb_hardlimit;/* absolute limit on realtime blks */
-/*64*/  xfs_qcnt_t      d_rtb_softlimit;/* preferred limit on RT disk blks */
-/*64*/  xfs_qcnt_t      d_rtbcount;     /* realtime blocks owned */
-/*32*/  __int32_t       d_rtbtimer;     /* similar to above; for RT disk blocks */
-/*16*/  xfs_qwarncnt_t  d_rtbwarns;     /* warnings issued wrt RT disk blocks */
-/*16*/  __uint16_t      d_pad;
+        __be32          d_btimer;       /* similar to above; for disk blocks */
+        __be16          d_iwarns;       /* warnings issued wrt num inodes */
+        __be16          d_bwarns;       /* warnings issued wrt disk blocks */
+        __be32          d_pad0;         /* 64 bit align */
+        __be64          d_rtb_hardlimit;/* absolute limit on realtime blks */
+        __be64          d_rtb_softlimit;/* preferred limit on RT disk blks */
+        __be64          d_rtbcount;     /* realtime blocks owned */
+        __be32          d_rtbtimer;     /* similar to above; for RT disk blocks */
+        __be16          d_rtbwarns;     /* warnings issued wrt RT disk blocks */
+        __be16          d_pad;
 } xfs_disk_dquot_t;
 
 /*