From 3e1b1abb3c338bd26562f6e9dac9e5eee68af7b4 Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Thu, 27 Jun 2013 12:47:51 -0400
Subject: [PATCH] --- yaml --- r: 377653 b: refs/heads/master c:
 a01aedfe21637c965a7046271fedfdd681eba646 h: refs/heads/master i:   377651:
 f2ed5404bae46b2c8819f5ac7f98761476fce0bb v: v3

---
 [refs]               | 2 +-
 trunk/fs/gfs2/bmap.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ccbf742be147..15034fa051b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a98c333edd0ada67e96a5dbd0445808147833f7
+refs/heads/master: a01aedfe21637c965a7046271fedfdd681eba646
diff --git a/trunk/fs/gfs2/bmap.c b/trunk/fs/gfs2/bmap.c
index 93b5809c20bb..5e2f56fccf6b 100644
--- a/trunk/fs/gfs2/bmap.c
+++ b/trunk/fs/gfs2/bmap.c
@@ -1232,7 +1232,9 @@ static int do_grow(struct inode *inode, u64 size)
 		unstuff = 1;
 	}
 
-	error = gfs2_trans_begin(sdp, RES_DINODE + RES_STATFS + RES_RG_BIT, 0);
+	error = gfs2_trans_begin(sdp, RES_DINODE + RES_STATFS + RES_RG_BIT +
+				 (sdp->sd_args.ar_quota == GFS2_QUOTA_OFF ?
+				  0 : RES_QUOTA), 0);
 	if (error)
 		goto do_grow_release;