summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/trans.h
diff options
context:
space:
mode:
authorBenjamin Marzinski <bmarzins@redhat.com>2010-09-27 23:00:04 +0200
committerSteven Whitehouse <swhiteho@redhat.com>2010-09-28 10:44:24 +0200
commitbf97b6734e027cc18abad420ab88f861f65d7816 (patch)
tree74892640ed482487f3bc630ad4fd20e62dec2c54 /fs/gfs2/trans.h
parentGFS2: Fix journal check for spectator mounts (diff)
downloadlinux-bf97b6734e027cc18abad420ab88f861f65d7816.tar.xz
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/trans.h')
-rw-r--r--fs/gfs2/trans.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/gfs2/trans.h b/fs/gfs2/trans.h
index b849eb7ad37d..fb56b783e028 100644
--- a/fs/gfs2/trans.h
+++ b/fs/gfs2/trans.h
@@ -26,6 +26,14 @@ struct gfs2_glock;
#define RES_STATFS 1
#define RES_QUOTA 2
+/* reserve either the number of blocks to be allocated plus the rg header
+ * block, or all of the blocks in the rg, whichever is smaller */
+static inline unsigned int gfs2_rg_blocks(const struct gfs2_alloc *al)
+{
+ return (al->al_requested < al->al_rgd->rd_length)?
+ al->al_requested + 1 : al->al_rgd->rd_length;
+}
+
int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks,
unsigned int revokes);