Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (57 commits)
  [GFS2] Accept old format NFS filehandles
  [GFS2] Small fixes to logging code
  [DLM] dump more lock values
  [GFS2] Remove i_mode passing from NFS File Handle
  [GFS2] Obtaining no_formal_ino from directory entry
  [GFS2] git-gfs2-nmw-build-fix
  [GFS2] System won't suspend with GFS2 file system mounted
  [GFS2] remounting w/o acl option leaves acls enabled
  [GFS2] inode size inconsistency
  [DLM] Telnet to port 21064 can stop all lockspaces
  [GFS2] Fix gfs2_block_truncate_page err return
  [GFS2] Addendum to the journaled file/unmount patch
  [GFS2] Simplify multiple glock aquisition
  [GFS2] assertion failure after writing to journaled file, umount
  [GFS2] Use zero_user_page() in stuffed_readpage()
  [GFS2] Remove bogus '\0' in rgrp.c
  [GFS2] Journaled file write/unstuff bug
  [DLM] don't require FS flag on all nodes
  [GFS2] Fix deallocation issues
  [GFS2] return conflicts for GETLK
  ...

1 files changed, 51 insertions, 6 deletions

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index c186857e48a8..6e546ee8f3d4 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -66,6 +66,18 @@
 #define QUOTA_USER 1
 #define QUOTA_GROUP 0
 
+struct gfs2_quota_host {
+        u64 qu_limit;
+        u64 qu_warn;
+        s64 qu_value;
+};
+
+struct gfs2_quota_change_host {
+        u64 qc_change;
+        u32 qc_flags; /* GFS2_QCF_... */
+        u32 qc_id;
+};
+
 static u64 qd2offset(struct gfs2_quota_data *qd)
 {
         u64 offset;
@@ -561,6 +573,25 @@ static void do_qc(struct gfs2_quota_data *qd, s64 change)
         mutex_unlock(&sdp->sd_quota_mutex);
 }
 
+static void gfs2_quota_in(struct gfs2_quota_host *qu, const void *buf)
+{
+        const struct gfs2_quota *str = buf;
+
+        qu->qu_limit = be64_to_cpu(str->qu_limit);
+        qu->qu_warn = be64_to_cpu(str->qu_warn);
+        qu->qu_value = be64_to_cpu(str->qu_value);
+}
+
+static void gfs2_quota_out(const struct gfs2_quota_host *qu, void *buf)
+{
+        struct gfs2_quota *str = buf;
+
+        str->qu_limit = cpu_to_be64(qu->qu_limit);
+        str->qu_warn = cpu_to_be64(qu->qu_warn);
+        str->qu_value = cpu_to_be64(qu->qu_value);
+        memset(&str->qu_reserved, 0, sizeof(str->qu_reserved));
+}
+
 /**
  * gfs2_adjust_quota
  *
@@ -573,12 +604,13 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc,
         struct inode *inode = &ip->i_inode;
         struct address_space *mapping = inode->i_mapping;
         unsigned long index = loc >> PAGE_CACHE_SHIFT;
-        unsigned offset = loc & (PAGE_CACHE_SHIFT - 1);
+        unsigned offset = loc & (PAGE_CACHE_SIZE - 1);
         unsigned blocksize, iblock, pos;
         struct buffer_head *bh;
         struct page *page;
         void *kaddr;
-        __be64 *ptr;
+        char *ptr;
+        struct gfs2_quota_host qp;
         s64 value;
         int err = -EIO;
 
@@ -620,13 +652,17 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc,
 
         kaddr = kmap_atomic(page, KM_USER0);
         ptr = kaddr + offset;
-        value = (s64)be64_to_cpu(*ptr) + change;
-        *ptr = cpu_to_be64(value);
+        gfs2_quota_in(&qp, ptr);
+        qp.qu_value += change;
+        value = qp.qu_value;
+        gfs2_quota_out(&qp, ptr);
         flush_dcache_page(page);
         kunmap_atomic(kaddr, KM_USER0);
         err = 0;
         qd->qd_qb.qb_magic = cpu_to_be32(GFS2_MAGIC);
         qd->qd_qb.qb_value = cpu_to_be64(value);
+        ((struct gfs2_quota_lvb*)(qd->qd_gl->gl_lvb))->qb_magic = cpu_to_be32(GFS2_MAGIC);
+        ((struct gfs2_quota_lvb*)(qd->qd_gl->gl_lvb))->qb_value = cpu_to_be64(value);
 unlock:
         unlock_page(page);
         page_cache_release(page);
@@ -689,7 +725,7 @@ static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda)
                         goto out_alloc;
 
                 error = gfs2_trans_begin(sdp,
-                                         al->al_rgd->rd_ri.ri_length +
+                                         al->al_rgd->rd_length +
                                          num_qd * data_blocks +
                                          nalloc * ind_blocks +
                                          RES_DINODE + num_qd +
@@ -709,7 +745,7 @@ static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda)
                 offset = qd2offset(qd);
                 error = gfs2_adjust_quota(ip, offset, qd->qd_change_sync,
                                           (struct gfs2_quota_data *)
-                                          qd->qd_gl->gl_lvb);
+                                          qd);
                 if (error)
                         goto out_end_trans;
 
@@ -1050,6 +1086,15 @@ int gfs2_quota_refresh(struct gfs2_sbd *sdp, int user, u32 id)
         return error;
 }
 
+static void gfs2_quota_change_in(struct gfs2_quota_change_host *qc, const void *buf)
+{
+        const struct gfs2_quota_change *str = buf;
+
+        qc->qc_change = be64_to_cpu(str->qc_change);
+        qc->qc_flags = be32_to_cpu(str->qc_flags);
+        qc->qc_id = be32_to_cpu(str->qc_id);
+}
+
 int gfs2_quota_init(struct gfs2_sbd *sdp)
 {
         struct gfs2_inode *ip = GFS2_I(sdp->sd_qc_inode);