From cb5ad399daf3f2eae582375b9c6e7dc697f9abde Mon Sep 17 00:00:00 2001
From: Abhijith Das <adas@redhat.com>
Date: Wed, 16 May 2007 17:02:19 -0500
Subject: [PATCH] --- yaml --- r: 58546 b: refs/heads/master c:
 2a87ab080607d009b8b2a8706f4e27d70402ca9c h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/fs/gfs2/incore.h            | 8 --------
 trunk/fs/gfs2/quota.c             | 4 +++-
 trunk/include/linux/gfs2_ondisk.h | 8 ++++++++
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 60b063a6d79c..f582f4f2cec0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbb7cae2a36170cd17ffbe286ec0c91a998740ff
+refs/heads/master: 2a87ab080607d009b8b2a8706f4e27d70402ca9c
diff --git a/trunk/fs/gfs2/incore.h b/trunk/fs/gfs2/incore.h
index 00c3004a4c22..b2079fcd2513 100644
--- a/trunk/fs/gfs2/incore.h
+++ b/trunk/fs/gfs2/incore.h
@@ -275,14 +275,6 @@ enum {
 	QDF_LOCKED		= 2,
 };
 
-struct gfs2_quota_lvb {
-        __be32 qb_magic;
-        u32 __pad;
-        __be64 qb_limit;      /* Hard limit of # blocks to alloc */
-        __be64 qb_warn;       /* Warn user when alloc is above this # */
-        __be64 qb_value;       /* Current # blocks allocated */
-};
-
 struct gfs2_quota_data {
 	struct list_head qd_list;
 	unsigned int qd_count;
diff --git a/trunk/fs/gfs2/quota.c b/trunk/fs/gfs2/quota.c
index c186857e48a8..fcd3ee2c5b96 100644
--- a/trunk/fs/gfs2/quota.c
+++ b/trunk/fs/gfs2/quota.c
@@ -627,6 +627,8 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc,
 	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);
@@ -709,7 +711,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;
 
diff --git a/trunk/include/linux/gfs2_ondisk.h b/trunk/include/linux/gfs2_ondisk.h
index a82ec8c62eff..028f9810ba07 100644
--- a/trunk/include/linux/gfs2_ondisk.h
+++ b/trunk/include/linux/gfs2_ondisk.h
@@ -500,6 +500,14 @@ struct gfs2_quota_change_host {
 	__u32 qc_id;
 };
 
+struct gfs2_quota_lvb {
+        __be32 qb_magic;
+        u32 __pad;
+        __be64 qb_limit;      /* Hard limit of # blocks to alloc */
+        __be64 qb_warn;       /* Warn user when alloc is above this # */
+        __be64 qb_value;       /* Current # blocks allocated */
+};
+
 #ifdef __KERNEL__
 /* Translation functions */
 struct gfs2_inode;