summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/aops.c
diff options
context:
space:
mode:
authorBenjamin Marzinski <bmarzins@redhat.com>2010-09-27 16:00:04 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2010-09-28 09:44:24 +0100
commitbf97b6734e027cc18abad420ab88f861f65d7816 (patch)
tree74892640ed482487f3bc630ad4fd20e62dec2c54 /fs/gfs2/aops.c
parentd0795f912318f65b800c6b619d749c3bf7c930fb (diff)
downloadlinux-bf97b6734e027cc18abad420ab88f861f65d7816.tar.gz
linux-bf97b6734e027cc18abad420ab88f861f65d7816.tar.bz2
linux-bf97b6734e027cc18abad420ab88f861f65d7816.zip
GFS2: reserve more blocks for transactions
Some of the functions in GFS2 were not reserving space in the transaction for the resource group header and the resource groups bitblocks that get added when you do allocation. GFS2 now makes sure to reserve space for the resource group header and either all the bitblocks in the resource group, or one for each block that it may allocate, whichever is smaller using the new gfs2_rg_blocks() inline function. Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/aops.c')
-rw-r--r--fs/gfs2/aops.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index 180ef8a6de6b..1bf178831ae8 100644
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -663,6 +663,8 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping,
rblocks += RES_STATFS + RES_QUOTA;
if (&ip->i_inode == sdp->sd_rindex)
rblocks += 2 * RES_STATFS;
+ if (alloc_required)
+ rblocks += gfs2_rg_blocks(al);
error = gfs2_trans_begin(sdp, rblocks,
PAGE_CACHE_SIZE/sdp->sd_sb.sb_bsize);