Commit 1639431a authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Merge gfs2_alloc_meta and gfs2_alloc_data 



Thanks to the preceeding patches, the only difference between
these two functions is their name. We can thus merge them
and call the new function gfs2_alloc_block to reflect the
fact that it can allocate either kind of block.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 5731be53

fs/gfs2/bmap.c

+5 −8
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page) 
		   and write it out to disk */



		if (isdir) {

			block = gfs2_alloc_meta(ip);

			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,7 +146,7 @@ int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page) 
					      dibh, sizeof(struct gfs2_dinode));

			brelse(bh);

		} else {

			block = gfs2_alloc_data(ip);

			block = gfs2_alloc_block(ip);



			error = gfs2_unstuffer_page(ip, dibh, block, page);

			if (error)
@@ -205,7 +205,7 @@ static int build_height(struct inode *inode, struct metapath *mp, unsigned heigh 
		return error;



	for(n = 0; n < new_height; n++) {

		bn = gfs2_alloc_meta(ip);

		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);
@@ -369,12 +369,9 @@ static int lookup_block(struct gfs2_inode *ip, unsigned int height, 
	if (!create)

		return 0;



	if (height == ip->i_height - 1 && !gfs2_is_dir(ip))

		*block = gfs2_alloc_data(ip);

	else {

		*block = gfs2_alloc_meta(ip);

	*block = gfs2_alloc_block(ip);

	if (height != ip->i_height - 1 || gfs2_is_dir(ip))

		gfs2_trans_add_unrevoke(GFS2_SB(&ip->i_inode), *block, 1);

	}



	gfs2_trans_add_bh(ip->i_gl, mp->mp_bh[height], 1);

fs/gfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ static struct gfs2_dirent *gfs2_dirent_search(struct inode *inode, 
static struct gfs2_leaf *new_leaf(struct inode *inode, struct buffer_head **pbh, u16 depth)

{

	struct gfs2_inode *ip = GFS2_I(inode);

	u64 bn = gfs2_alloc_meta(ip);

	u64 bn = gfs2_alloc_block(ip);

	struct buffer_head *bh = gfs2_meta_new(ip->i_gl, bn);

	struct gfs2_leaf *leaf;

	struct gfs2_dirent *dent;

fs/gfs2/eattr.c

+3 −3
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static int ea_alloc_blk(struct gfs2_inode *ip, struct buffer_head **bhp) 
	struct gfs2_ea_header *ea;

	u64 block;



	block = gfs2_alloc_meta(ip);

	block = gfs2_alloc_block(ip);

	gfs2_trans_add_unrevoke(sdp, block, 1);

	*bhp = gfs2_meta_new(ip->i_gl, block);

	gfs2_trans_add_bh(ip->i_gl, *bhp, 1);
@@ -643,7 +643,7 @@ static int ea_write(struct gfs2_inode *ip, struct gfs2_ea_header *ea, 
			u64 block;

			int mh_size = sizeof(struct gfs2_meta_header);



			block = gfs2_alloc_meta(ip);

			block = gfs2_alloc_block(ip);

			gfs2_trans_add_unrevoke(sdp, block, 1);

			bh = gfs2_meta_new(ip->i_gl, block);

			gfs2_trans_add_bh(ip->i_gl, bh, 1);
@@ -967,7 +967,7 @@ static int ea_set_block(struct gfs2_inode *ip, struct gfs2_ea_request *er, 
	} else {

		u64 blk;



		blk = gfs2_alloc_meta(ip);

		blk = gfs2_alloc_block(ip);

		gfs2_trans_add_unrevoke(sdp, blk, 1);

		indbh = gfs2_meta_new(ip->i_gl, blk);

		gfs2_trans_add_bh(ip->i_gl, indbh, 1);

fs/gfs2/rgrp.c

+3 −48
Original line number Diff line number Diff line
@@ -1405,58 +1405,13 @@ static struct gfs2_rgrpd *rgblk_free(struct gfs2_sbd *sdp, u64 bstart, 
}



/**

 * gfs2_alloc_data - Allocate a data block

 * @ip: the inode to allocate the data block for

 * gfs2_alloc_block - Allocate a block

 * @ip: the inode to allocate the block for

 *

 * Returns: the allocated block

 */



u64 gfs2_alloc_data(struct gfs2_inode *ip)

{

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

	struct gfs2_alloc *al = ip->i_alloc;

	struct gfs2_rgrpd *rgd = al->al_rgd;

	u32 goal, blk;

	u64 block;



	if (rgrp_contains_block(rgd, ip->i_goal))

		goal = ip->i_goal - rgd->rd_data0;

	else

		goal = rgd->rd_last_alloc;



	blk = rgblk_search(rgd, goal, GFS2_BLKST_FREE, GFS2_BLKST_USED);

	BUG_ON(blk == BFITNOENT);

	rgd->rd_last_alloc = blk;



	block = rgd->rd_data0 + blk;

	ip->i_goal = block;



	gfs2_assert_withdraw(sdp, rgd->rd_rg.rg_free);

	rgd->rd_rg.rg_free--;



	gfs2_trans_add_bh(rgd->rd_gl, rgd->rd_bits[0].bi_bh, 1);

	gfs2_rgrp_out(rgd, rgd->rd_bits[0].bi_bh->b_data);



	al->al_alloced++;



	gfs2_statfs_change(sdp, 0, -1, 0);

	gfs2_quota_change(ip, +1, ip->i_inode.i_uid, ip->i_inode.i_gid);



	spin_lock(&sdp->sd_rindex_spin);

	rgd->rd_free_clone--;

	spin_unlock(&sdp->sd_rindex_spin);



	return block;

}



/**

 * gfs2_alloc_meta - Allocate a metadata block

 * @ip: the inode to allocate the metadata block for

 *

 * Returns: the allocated block

 */



u64 gfs2_alloc_meta(struct gfs2_inode *ip)

u64 gfs2_alloc_block(struct gfs2_inode *ip)

{

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

	struct gfs2_alloc *al = ip->i_alloc;

fs/gfs2/rgrp.h

+1 −2
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ void gfs2_inplace_release(struct gfs2_inode *ip); 


unsigned char gfs2_get_block_type(struct gfs2_rgrpd *rgd, u64 block);



u64 gfs2_alloc_data(struct gfs2_inode *ip);

u64 gfs2_alloc_meta(struct gfs2_inode *ip);

u64 gfs2_alloc_block(struct gfs2_inode *ip);

u64 gfs2_alloc_di(struct gfs2_inode *ip, u64 *generation);



void gfs2_free_data(struct gfs2_inode *ip, u64 bstart, u32 blen);