diff options
author | Benjamin Marzinski <bmarzins@redhat.com> | 2010-09-27 16:00:04 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2010-09-28 09:44:24 +0100 |
commit | bf97b6734e027cc18abad420ab88f861f65d7816 (patch) | |
tree | 74892640ed482487f3bc630ad4fd20e62dec2c54 /fs/gfs2/file.c | |
parent | d0795f912318f65b800c6b619d749c3bf7c930fb (diff) | |
download | linux-3.10-bf97b6734e027cc18abad420ab88f861f65d7816.tar.gz linux-3.10-bf97b6734e027cc18abad420ab88f861f65d7816.tar.bz2 linux-3.10-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/file.c')
-rw-r--r-- | fs/gfs2/file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index daadcd2e755..237ee6a940d 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -382,8 +382,10 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) rblocks = RES_DINODE + ind_blocks; if (gfs2_is_jdata(ip)) rblocks += data_blocks ? data_blocks : 1; - if (ind_blocks || data_blocks) + if (ind_blocks || data_blocks) { rblocks += RES_STATFS + RES_QUOTA; + rblocks += gfs2_rg_blocks(al); + } ret = gfs2_trans_begin(sdp, rblocks, 0); if (ret) goto out_trans_fail; |