diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2013-06-27 12:47:51 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2013-06-27 18:16:27 +0100 |
| commit | a01aedfe21637c965a7046271fedfdd681eba646 (patch) | |
| tree | 68e2113fc6457a7ff467ab84f5968f863dddd864 /fs/gfs2 | |
| parent | 6a98c333edd0ada67e96a5dbd0445808147833f7 (diff) | |
| download | linux-a01aedfe21637c965a7046271fedfdd681eba646.tar.gz linux-a01aedfe21637c965a7046271fedfdd681eba646.tar.bz2 linux-a01aedfe21637c965a7046271fedfdd681eba646.zip | |
GFS2: Reserve journal space for quota change in do_grow
If a GFS2 file system is mounted with quotas and a file is grown
in such a way that its free blocks for the allocation are represented
in a secondary bitmap, GFS2 ran out of blocks in the transaction.
That resulted in "fatal: assertion "tr->tr_num_buf <= tr->tr_blocks".
This patch reserves extra blocks for the quota change so the
transaction has enough space.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/bmap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 93b5809c20bb..5e2f56fccf6b 100644 --- a/fs/gfs2/bmap.c +++ b/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; |