From 6b1cf44aae1722b90857cc83af68278fd044c39b Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 20 Jun 2006 16:13:49 -0400
Subject: [PATCH] --- yaml --- r: 38719 b: refs/heads/master c:
 0d42e54220ba34e031167138ef91cbd42d8b5876 h: refs/heads/master i:   38717:
 a647943a3943dca26855a7fc4ba4762ed8eaa759   38715:
 0e9d7312462c38c8a5de39f7ccceff8b11cca091   38711:
 52e068bf48ed0f2555103acb70a0267e431cbfb8   38703:
 b265c853ac9f2cdc87c5895b07ab6497f024653c   38687:
 3b7ea549915d54146c4861a816d8ed4de972ec12   38655:
 7b8362b686c6a3a184389ece79fe97e0ecfdaf4d v: v3

---
 [refs]                | 2 +-
 trunk/fs/gfs2/quota.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6827dd0dcefb..753452c42061 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0239c4ae8aa5cdee6dc3792effc2800d65292c04
+refs/heads/master: 0d42e54220ba34e031167138ef91cbd42d8b5876
diff --git a/trunk/fs/gfs2/quota.c b/trunk/fs/gfs2/quota.c
index d3cd5171d7c7..1892b29ec98d 100644
--- a/trunk/fs/gfs2/quota.c
+++ b/trunk/fs/gfs2/quota.c
@@ -649,7 +649,6 @@ static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda)
 	struct gfs2_sbd *sdp = (*qda)->qd_gl->gl_sbd;
 	struct gfs2_inode *ip = GFS2_I(sdp->sd_quota_inode);
 	unsigned int data_blocks, ind_blocks;
-	struct file_ra_state ra_state;
 	struct gfs2_holder *ghs, i_gh;
 	unsigned int qx, x;
 	struct gfs2_quota_data *qd;
@@ -716,7 +715,6 @@ static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda)
 			goto out_gunlock;
 	}
 
-	file_ra_state_init(&ra_state, ip->i_inode.i_mapping);
 	for (x = 0; x < num_qd; x++) {
 		qd = qda[x];
 		offset = qd2offset(qd);
@@ -790,10 +788,8 @@ static int do_glock(struct gfs2_quota_data *qd, int force_refresh,
 
 		memset(buf, 0, sizeof(struct gfs2_quota));
 		pos = qd2offset(qd);
-		error = gfs2_internal_read(ip,
-					    &ra_state, buf,
-					    &pos,
-					    sizeof(struct gfs2_quota));
+		error = gfs2_internal_read(ip, &ra_state, buf,
+					   &pos, sizeof(struct gfs2_quota));
 		if (error < 0)
 			goto fail_gunlock;