---

yaml --- r: 377653 b: refs/heads/master c: a01aedf h: refs/heads/master i: 377651: f2ed540 v: v3
git-mirror · Jun 27, 2013 · 3e1b1ab · 3e1b1ab
1 parent 043c58d
commit 3e1b1ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;