Commit 70b0c365 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Use cached rgrp in gfs2_rlist_add() 



Each block which is deallocated, requires a call to gfs2_rlist_add()
and each of those calls was calling gfs2_blk2rgrpd() in order to
figure out which rgrp the block belonged in. This can be speeded up
by making use of the rgrp cached in the inode. We also reset this
cached rgrp in case the block has changed rgrp. This should provide
a big reduction in gfs2_blk2rgrpd() calls during deallocation.

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

fs/gfs2/bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh, 
			blen++;

		else {

			if (bstart)

				gfs2_rlist_add(sdp, &rlist, bstart);

				gfs2_rlist_add(ip, &rlist, bstart);



			bstart = bn;

			blen = 1;
@@ -732,7 +732,7 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh, 
	}



	if (bstart)

		gfs2_rlist_add(sdp, &rlist, bstart);

		gfs2_rlist_add(ip, &rlist, bstart);

	else

		goto out; /* Nothing to do */

fs/gfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -1821,7 +1821,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len, 
		if (blk != leaf_no)

			brelse(bh);



		gfs2_rlist_add(sdp, &rlist, blk);

		gfs2_rlist_add(dip, &rlist, blk);

		l_blocks++;

	}

fs/gfs2/rgrp.c

+9 −5
Original line number Diff line number Diff line
@@ -1560,7 +1560,7 @@ fail: 


/**

 * gfs2_rlist_add - add a RG to a list of RGs

 * @sdp: the filesystem

 * @ip: the inode

 * @rlist: the list of resource groups

 * @block: the block

 *
@@ -1570,9 +1570,10 @@ fail: 
 *

 */



void gfs2_rlist_add(struct gfs2_sbd *sdp, struct gfs2_rgrp_list *rlist,

void gfs2_rlist_add(struct gfs2_inode *ip, struct gfs2_rgrp_list *rlist,

		    u64 block)

{

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

	struct gfs2_rgrpd *rgd;

	struct gfs2_rgrpd **tmp;

	unsigned int new_space;
@@ -1581,12 +1582,15 @@ void gfs2_rlist_add(struct gfs2_sbd *sdp, struct gfs2_rgrp_list *rlist, 
	if (gfs2_assert_warn(sdp, !rlist->rl_ghs))

		return;



	if (ip->i_rgd && rgrp_contains_block(ip->i_rgd, block))

		rgd = ip->i_rgd;

	else

		rgd = gfs2_blk2rgrpd(sdp, block);

	if (!rgd) {

		if (gfs2_consist(sdp))

			fs_err(sdp, "block = %llu\n", (unsigned long long)block);

		fs_err(sdp, "rlist_add: no rgrp for block %llu\n", (unsigned long long)block);

		return;

	}

	ip->i_rgd = rgd;



	for (x = 0; x < rlist->rl_rgrps; x++)

		if (rlist->rl_rgd[x] == rgd)

fs/gfs2/rgrp.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct gfs2_rgrp_list { 
	struct gfs2_holder *rl_ghs;

};



extern void gfs2_rlist_add(struct gfs2_sbd *sdp, struct gfs2_rgrp_list *rlist,

extern void gfs2_rlist_add(struct gfs2_inode *ip, struct gfs2_rgrp_list *rlist,

			   u64 block);

extern void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist, unsigned int state);

extern void gfs2_rlist_free(struct gfs2_rgrp_list *rlist);

fs/gfs2/xattr.c

+2 −2
Original line number Diff line number Diff line
@@ -1356,14 +1356,14 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip) 
			blen++;

		else {

			if (bstart)

				gfs2_rlist_add(sdp, &rlist, bstart);

				gfs2_rlist_add(ip, &rlist, bstart);

			bstart = bn;

			blen = 1;

		}

		blks++;

	}

	if (bstart)

		gfs2_rlist_add(sdp, &rlist, bstart);

		gfs2_rlist_add(ip, &rlist, bstart);

	else

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE