[GFS2] Add extent allocation to block allocator
Rather than having to allocate a single block at a time, this patch
allows the block allocator to allocate an extent. Since there is
no difference (so far as the block allocator is concerned) between
data blocks and indirect blocks, it is posible to allocate a single
extent and for the caller to unrevoke just the blocks required
for indirect blocks.
Currently the only bit of GFS2 to make use of this feature is the
build height function. The intention is that gfs2_block_map will
be changed to make use of this feature in future patches.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index e3a75a2..1fda731 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -136,8 +136,9 @@
/* Get a free block, fill it with the stuffed data,
and write it out to disk */
+ unsigned int n = 1;
+ block = gfs2_alloc_block(ip, &n);
if (isdir) {
- block = gfs2_alloc_block(ip);
gfs2_trans_add_unrevoke(GFS2_SB(&ip->i_inode), block, 1);
error = gfs2_dir_get_new_buffer(ip, block, &bh);
if (error)
@@ -146,8 +147,6 @@
dibh, sizeof(struct gfs2_dinode));
brelse(bh);
} else {
- block = gfs2_alloc_block(ip);
-
error = gfs2_unstuffer_page(ip, dibh, block, page);
if (error)
goto out_brelse;
@@ -195,7 +194,7 @@
int error;
__be64 *bp;
u64 bn;
- unsigned n;
+ unsigned n, i = 0;
if (height <= ip->i_height)
return 0;
@@ -204,12 +203,16 @@
if (error)
return error;
- for(n = 0; n < new_height; n++) {
- bn = gfs2_alloc_block(ip);
- gfs2_trans_add_unrevoke(GFS2_SB(inode), bn, 1);
- mp->mp_bh[n] = gfs2_meta_new(ip->i_gl, bn);
- gfs2_trans_add_bh(ip->i_gl, mp->mp_bh[n], 1);
- }
+ do {
+ n = new_height - i;
+ bn = gfs2_alloc_block(ip, &n);
+ gfs2_trans_add_unrevoke(GFS2_SB(inode), bn, n);
+ do {
+ mp->mp_bh[i] = gfs2_meta_new(ip->i_gl, bn++);
+ gfs2_trans_add_bh(ip->i_gl, mp->mp_bh[i], 1);
+ i++;
+ } while(i < n);
+ } while(i < new_height);
n = 0;
bn = mp->mp_bh[0]->b_blocknr;
@@ -358,6 +361,7 @@
{
int boundary;
__be64 *ptr = metapointer(&boundary, height, mp);
+ unsigned int n = 1;
if (*ptr) {
*block = be64_to_cpu(*ptr);
@@ -369,7 +373,7 @@
if (!create)
return 0;
- *block = gfs2_alloc_block(ip);
+ *block = gfs2_alloc_block(ip, &n);
if (height != ip->i_height - 1 || gfs2_is_dir(ip))
gfs2_trans_add_unrevoke(GFS2_SB(&ip->i_inode), *block, 1);