Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54335b1f authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Cache the most recently used resource group in the inode 



This means that after the initial allocation for any inode, the
last used resource group is cached in the inode for future use.
This drastically reduces the number of lookups of resource
groups in the common case, and this the contention on that
data structure.

The allocation algorithm is the same as previously, except that we
always check to see if the goal block is within the cached rgrp
first before going to the rbtree to look one up.

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

fs/gfs2/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, 
	if (&ip->i_inode == sdp->sd_rindex)

		rblocks += 2 * RES_STATFS;

	if (alloc_required)

		rblocks += gfs2_rg_blocks(al);

		rblocks += gfs2_rg_blocks(ip);



	error = gfs2_trans_begin(sdp, rblocks,

				 PAGE_CACHE_SIZE/sdp->sd_sb.sb_bsize);

fs/gfs2/file.c

+3 −3
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 
		rblocks += data_blocks ? data_blocks : 1;

	if (ind_blocks || data_blocks) {

		rblocks += RES_STATFS + RES_QUOTA;

		rblocks += gfs2_rg_blocks(al);

		rblocks += gfs2_rg_blocks(ip);

	}

	ret = gfs2_trans_begin(sdp, rblocks, 0);

	if (ret)
@@ -823,7 +823,7 @@ static void calc_max_reserv(struct gfs2_inode *ip, loff_t max, loff_t *len, 
			    unsigned int *data_blocks, unsigned int *ind_blocks)

{

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

	unsigned int max_blocks = ip->i_alloc->al_rgd->rd_free_clone;

	unsigned int max_blocks = ip->i_rgd->rd_free_clone;

	unsigned int tmp, max_data = max_blocks - 3 * (sdp->sd_max_height - 1);



	for (tmp = max_data; tmp > sdp->sd_diptrs;) {
@@ -912,7 +912,7 @@ static long gfs2_fallocate(struct file *file, int mode, loff_t offset, 
		al->al_requested = data_blocks + ind_blocks;



		rblocks = RES_DINODE + ind_blocks + RES_STATFS + RES_QUOTA +

			  RES_RG_HDR + gfs2_rg_blocks(al);

			  RES_RG_HDR + gfs2_rg_blocks(ip);

		if (gfs2_is_jdata(ip))

			rblocks += data_blocks ? data_blocks : 1;

fs/gfs2/incore.h

+1 −2
Original line number Diff line number Diff line
@@ -256,8 +256,6 @@ struct gfs2_alloc { 
	unsigned int al_line;

	char *al_file;

	struct gfs2_holder al_rgd_gh;

	struct gfs2_rgrpd *al_rgd;



};



enum {
@@ -279,6 +277,7 @@ struct gfs2_inode { 
	struct gfs2_holder i_iopen_gh;

	struct gfs2_holder i_gh; /* for prepare/commit_write only */

	struct gfs2_alloc *i_alloc;

	struct gfs2_rgrpd *i_rgd;

	u64 i_goal;	/* goal block for allocations */

	struct rw_semaphore i_rw_mutex;

	struct list_head i_trunc_list;

fs/gfs2/inode.c

+5 −7
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static int link_dinode(struct gfs2_inode *dip, const struct qstr *name, 
			goto fail_quota_locks;



		error = gfs2_trans_begin(sdp, sdp->sd_max_dirres +

					 al->al_rgd->rd_length +

					 dip->i_rgd->rd_length +

					 2 * RES_DINODE +

					 RES_STATFS + RES_QUOTA, 0);

		if (error)
@@ -613,7 +613,6 @@ static int link_dinode(struct gfs2_inode *dip, const struct qstr *name, 
	gfs2_trans_end(sdp);



fail_ipreserv:

	if (dip->i_alloc->al_rgd)

	gfs2_inplace_release(dip);



fail_quota_locks:
@@ -731,7 +730,6 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry, 
		brelse(bh);



	gfs2_trans_end(sdp);

	if (dip->i_alloc->al_rgd)

	gfs2_inplace_release(dip);

	gfs2_quota_unlock(dip);

	gfs2_alloc_put(dip);
@@ -896,7 +894,7 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir, 
			goto out_gunlock_q;



		error = gfs2_trans_begin(sdp, sdp->sd_max_dirres +

					 gfs2_rg_blocks(al) +

					 gfs2_rg_blocks(dip) +

					 2 * RES_DINODE + RES_STATFS +

					 RES_QUOTA, 0);

		if (error)
@@ -1371,7 +1369,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry, 
			goto out_gunlock_q;



		error = gfs2_trans_begin(sdp, sdp->sd_max_dirres +

					 gfs2_rg_blocks(al) +

					 gfs2_rg_blocks(ndip) +

					 4 * RES_DINODE + 4 * RES_LEAF +

					 RES_STATFS + RES_QUOTA + 4, 0);

		if (error)

fs/gfs2/quota.c

+2 −2
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda) 
		goto out_alloc;



	if (nalloc)

		blocks += gfs2_rg_blocks(al) + nalloc * ind_blocks + RES_STATFS;

		blocks += gfs2_rg_blocks(ip) + nalloc * ind_blocks + RES_STATFS;



	error = gfs2_trans_begin(sdp, blocks, 0);

	if (error)
@@ -1598,7 +1598,7 @@ static int gfs2_set_dqblk(struct super_block *sb, int type, qid_t id, 
		error = gfs2_inplace_reserve(ip);

		if (error)

			goto out_alloc;

		blocks += gfs2_rg_blocks(al);

		blocks += gfs2_rg_blocks(ip);

	}



	/* Some quotas span block boundaries and can update two blocks,