Merge branch 'master' of /home/tglx/work/mtd/git/linux-2.6.git/

1 files changed, 42 insertions, 60 deletions

diff --git a/fs/xfs/quota/xfs_trans_dquot.c b/fs/xfs/quota/xfs_trans_dquot.c
index 3b99daf8a640..3290975d31f7 100644
--- a/fs/xfs/quota/xfs_trans_dquot.c
+++ b/fs/xfs/quota/xfs_trans_dquot.c
@@ -1,39 +1,25 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002 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
  */
-
 #include "xfs.h"
 #include "xfs_fs.h"
-#include "xfs_inum.h"
+#include "xfs_bit.h"
 #include "xfs_log.h"
+#include "xfs_inum.h"
 #include "xfs_trans.h"
 #include "xfs_sb.h"
 #include "xfs_ag.h"
@@ -43,21 +29,20 @@
 #include "xfs_dmapi.h"
 #include "xfs_quota.h"
 #include "xfs_mount.h"
-#include "xfs_alloc_btree.h"
 #include "xfs_bmap_btree.h"
+#include "xfs_alloc_btree.h"
 #include "xfs_ialloc_btree.h"
-#include "xfs_btree.h"
-#include "xfs_ialloc.h"
 #include "xfs_attr_sf.h"
 #include "xfs_dir_sf.h"
 #include "xfs_dir2_sf.h"
 #include "xfs_dinode.h"
 #include "xfs_inode.h"
+#include "xfs_ialloc.h"
+#include "xfs_itable.h"
+#include "xfs_btree.h"
 #include "xfs_bmap.h"
-#include "xfs_bit.h"
 #include "xfs_rtalloc.h"
 #include "xfs_error.h"
-#include "xfs_itable.h"
 #include "xfs_rw.h"
 #include "xfs_acl.h"
 #include "xfs_cap.h"
@@ -65,7 +50,6 @@
 #include "xfs_attr.h"
 #include "xfs_buf_item.h"
 #include "xfs_trans_priv.h"
-
 #include "xfs_qm.h"
 
 STATIC void     xfs_trans_alloc_dqinfo(xfs_trans_t *);
@@ -429,25 +413,25 @@ xfs_trans_apply_dquot_deltas(
                                 qtrx->qt_delrtb_delta;
 #ifdef QUOTADEBUG
                         if (totalbdelta < 0)
-                                ASSERT(INT_GET(d->d_bcount, ARCH_CONVERT) >=
+                                ASSERT(be64_to_cpu(d->d_bcount) >=
                                        (xfs_qcnt_t) -totalbdelta);
 
                         if (totalrtbdelta < 0)
-                                ASSERT(INT_GET(d->d_rtbcount, ARCH_CONVERT) >=
+                                ASSERT(be64_to_cpu(d->d_rtbcount) >=
                                        (xfs_qcnt_t) -totalrtbdelta);
 
                         if (qtrx->qt_icount_delta < 0)
-                                ASSERT(INT_GET(d->d_icount, ARCH_CONVERT) >=
+                                ASSERT(be64_to_cpu(d->d_icount) >=
                                        (xfs_qcnt_t) -qtrx->qt_icount_delta);
 #endif
                         if (totalbdelta)
-                                INT_MOD(d->d_bcount, ARCH_CONVERT, (xfs_qcnt_t)totalbdelta);
+                                be64_add(&d->d_bcount, (xfs_qcnt_t)totalbdelta);
 
                         if (qtrx->qt_icount_delta)
-                                INT_MOD(d->d_icount, ARCH_CONVERT, (xfs_qcnt_t)qtrx->qt_icount_delta);
+                                be64_add(&d->d_icount, (xfs_qcnt_t)qtrx->qt_icount_delta);
 
                         if (totalrtbdelta)
-                                INT_MOD(d->d_rtbcount, ARCH_CONVERT, (xfs_qcnt_t)totalrtbdelta);
+                                be64_add(&d->d_rtbcount, (xfs_qcnt_t)totalrtbdelta);
 
                         /*
                          * Get any default limits in use.
@@ -531,11 +515,11 @@ xfs_trans_apply_dquot_deltas(
                         }
 
                         ASSERT(dqp->q_res_bcount >=
-                                INT_GET(dqp->q_core.d_bcount, ARCH_CONVERT));
+                                be64_to_cpu(dqp->q_core.d_bcount));
                         ASSERT(dqp->q_res_icount >=
-                                INT_GET(dqp->q_core.d_icount, ARCH_CONVERT));
+                                be64_to_cpu(dqp->q_core.d_icount));
                         ASSERT(dqp->q_res_rtbcount >=
-                                INT_GET(dqp->q_core.d_rtbcount, ARCH_CONVERT));
+                                be64_to_cpu(dqp->q_core.d_rtbcount));
                 }
                 /*
                  * Do the group quotas next
@@ -642,26 +626,26 @@ xfs_trans_dqresv(
         }
         ASSERT(XFS_DQ_IS_LOCKED(dqp));
         if (flags & XFS_TRANS_DQ_RES_BLKS) {
-                hardlimit = INT_GET(dqp->q_core.d_blk_hardlimit, ARCH_CONVERT);
+                hardlimit = be64_to_cpu(dqp->q_core.d_blk_hardlimit);
                 if (!hardlimit)
                         hardlimit = q->qi_bhardlimit;
-                softlimit = INT_GET(dqp->q_core.d_blk_softlimit, ARCH_CONVERT);
+                softlimit = be64_to_cpu(dqp->q_core.d_blk_softlimit);
                 if (!softlimit)
                         softlimit = q->qi_bsoftlimit;
-                timer = INT_GET(dqp->q_core.d_btimer, ARCH_CONVERT);
-                warns = INT_GET(dqp->q_core.d_bwarns, ARCH_CONVERT);
+                timer = be32_to_cpu(dqp->q_core.d_btimer);
+                warns = be16_to_cpu(dqp->q_core.d_bwarns);
                 warnlimit = XFS_QI_BWARNLIMIT(dqp->q_mount);
                 resbcountp = &dqp->q_res_bcount;
         } else {
                 ASSERT(flags & XFS_TRANS_DQ_RES_RTBLKS);
-                hardlimit = INT_GET(dqp->q_core.d_rtb_hardlimit, ARCH_CONVERT);
+                hardlimit = be64_to_cpu(dqp->q_core.d_rtb_hardlimit);
                 if (!hardlimit)
                         hardlimit = q->qi_rtbhardlimit;
-                softlimit = INT_GET(dqp->q_core.d_rtb_softlimit, ARCH_CONVERT);
+                softlimit = be64_to_cpu(dqp->q_core.d_rtb_softlimit);
                 if (!softlimit)
                         softlimit = q->qi_rtbsoftlimit;
-                timer = INT_GET(dqp->q_core.d_rtbtimer, ARCH_CONVERT);
-                warns = INT_GET(dqp->q_core.d_rtbwarns, ARCH_CONVERT);
+                timer = be32_to_cpu(dqp->q_core.d_rtbtimer);
+                warns = be16_to_cpu(dqp->q_core.d_rtbwarns);
                 warnlimit = XFS_QI_RTBWARNLIMIT(dqp->q_mount);
                 resbcountp = &dqp->q_res_rtbcount;
         }
@@ -700,16 +684,14 @@ xfs_trans_dqresv(
                         }
                 }
                 if (ninos > 0) {
-                        count = INT_GET(dqp->q_core.d_icount, ARCH_CONVERT);
-                        timer = INT_GET(dqp->q_core.d_itimer, ARCH_CONVERT);
-                        warns = INT_GET(dqp->q_core.d_iwarns, ARCH_CONVERT);
+                        count = be64_to_cpu(dqp->q_core.d_icount);
+                        timer = be32_to_cpu(dqp->q_core.d_itimer);
+                        warns = be16_to_cpu(dqp->q_core.d_iwarns);
                         warnlimit = XFS_QI_IWARNLIMIT(dqp->q_mount);
-                        hardlimit = INT_GET(dqp->q_core.d_ino_hardlimit,
-                                                ARCH_CONVERT);
+                        hardlimit = be64_to_cpu(dqp->q_core.d_ino_hardlimit);
                         if (!hardlimit)
                                 hardlimit = q->qi_ihardlimit;
-                        softlimit = INT_GET(dqp->q_core.d_ino_softlimit,
-                                                ARCH_CONVERT);
+                        softlimit = be64_to_cpu(dqp->q_core.d_ino_softlimit);
                         if (!softlimit)
                                 softlimit = q->qi_isoftlimit;
                         if (hardlimit > 0ULL && count >= hardlimit) {
@@ -756,9 +738,9 @@ xfs_trans_dqresv(
                                             XFS_TRANS_DQ_RES_INOS,
                                             ninos);
         }
-        ASSERT(dqp->q_res_bcount >= INT_GET(dqp->q_core.d_bcount, ARCH_CONVERT));
-        ASSERT(dqp->q_res_rtbcount >= INT_GET(dqp->q_core.d_rtbcount, ARCH_CONVERT));
-        ASSERT(dqp->q_res_icount >= INT_GET(dqp->q_core.d_icount, ARCH_CONVERT));
+        ASSERT(dqp->q_res_bcount >= be64_to_cpu(dqp->q_core.d_bcount));
+        ASSERT(dqp->q_res_rtbcount >= be64_to_cpu(dqp->q_core.d_rtbcount));
+        ASSERT(dqp->q_res_icount >= be64_to_cpu(dqp->q_core.d_icount));
 
 error_return:
         if (! (flags & XFS_QMOPT_DQLOCK)) {