Commit 5407e242 authored by Bob Peterson's avatar Bob Peterson Committed by Steven Whitehouse
Browse files

GFS2: Fold quota data into the reservations struct 



This patch moves the ancillary quota data structures into the
block reservations structure. This saves GFS2 some time and
effort in allocating and deallocating the qadata structure.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 0a305e49

fs/gfs2/aops.c

+2 −14
Original line number Diff line number Diff line
@@ -614,7 +614,6 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, 
	unsigned int data_blocks = 0, ind_blocks = 0, rblocks;

	int alloc_required;

	int error = 0;

	struct gfs2_qadata *qa = NULL;

	pgoff_t index = pos >> PAGE_CACHE_SHIFT;

	unsigned from = pos & (PAGE_CACHE_SIZE - 1);

	struct page *page;
@@ -638,15 +637,9 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, 
		gfs2_write_calc_reserv(ip, len, &data_blocks, &ind_blocks);



	if (alloc_required) {

		qa = gfs2_qadata_get(ip);

		if (!qa) {

			error = -ENOMEM;

			goto out_unlock;

		}



		error = gfs2_quota_lock_check(ip);

		if (error)

			goto out_alloc_put;

			goto out_unlock;



		error = gfs2_inplace_reserve(ip, data_blocks + ind_blocks);

		if (error)
@@ -708,8 +701,6 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, 
		gfs2_inplace_release(ip);

out_qunlock:

		gfs2_quota_unlock(ip);

out_alloc_put:

		gfs2_qadata_put(ip);

	}

out_unlock:

	if (&ip->i_inode == sdp->sd_rindex) {
@@ -846,7 +837,6 @@ static int gfs2_write_end(struct file *file, struct address_space *mapping, 
	struct gfs2_sbd *sdp = GFS2_SB(inode);

	struct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode);

	struct buffer_head *dibh;

	struct gfs2_qadata *qa = ip->i_qadata;

	unsigned int from = pos & (PAGE_CACHE_SIZE - 1);

	unsigned int to = from + len;

	int ret;
@@ -880,10 +870,8 @@ static int gfs2_write_end(struct file *file, struct address_space *mapping, 
	gfs2_trans_end(sdp);

	if (gfs2_mb_reserved(ip))

		gfs2_inplace_release(ip);

	if (qa) {

	if (ip->i_res->rs_qa_qd_num)

		gfs2_quota_unlock(ip);

		gfs2_qadata_put(ip);

	}

	if (inode == sdp->sd_rindex) {

		gfs2_glock_dq(&m_ip->i_gh);

		gfs2_holder_uninit(&m_ip->i_gh);

fs/gfs2/bmap.c

+5 −13
Original line number Diff line number Diff line
@@ -1045,12 +1045,13 @@ static int trunc_dealloc(struct gfs2_inode *ip, u64 size) 
		lblock = (size - 1) >> sdp->sd_sb.sb_bsize_shift;



	find_metapath(sdp, lblock, &mp, ip->i_height);

	if (!gfs2_qadata_get(ip))

		return -ENOMEM;

	error = gfs2_rindex_update(sdp);

	if (error)

		return error;



	error = gfs2_quota_hold(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);

	if (error)

		goto out;

		return error;



	while (height--) {

		struct strip_mine sm;
@@ -1064,8 +1065,6 @@ static int trunc_dealloc(struct gfs2_inode *ip, u64 size) 


	gfs2_quota_unhold(ip);



out:

	gfs2_qadata_put(ip);

	return error;

}
@@ -1167,19 +1166,14 @@ static int do_grow(struct inode *inode, u64 size) 
	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_sbd *sdp = GFS2_SB(inode);

	struct buffer_head *dibh;

	struct gfs2_qadata *qa = NULL;

	int error;

	int unstuff = 0;



	if (gfs2_is_stuffed(ip) &&

	    (size > (sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode)))) {

		qa = gfs2_qadata_get(ip);

		if (qa == NULL)

			return -ENOMEM;



		error = gfs2_quota_lock_check(ip);

		if (error)

			goto do_grow_alloc_put;

			return error;



		error = gfs2_inplace_reserve(ip, 1);

		if (error)
@@ -1214,8 +1208,6 @@ static int do_grow(struct inode *inode, u64 size) 
		gfs2_inplace_release(ip);

do_grow_qunlock:

		gfs2_quota_unlock(ip);

do_grow_alloc_put:

		gfs2_qadata_put(ip);

	}

	return error;

}

fs/gfs2/dir.c

+1 −8
Original line number Diff line number Diff line
@@ -1854,14 +1854,9 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len, 
	if (!ht)

		return -ENOMEM;



	if (!gfs2_qadata_get(dip)) {

		error = -ENOMEM;

		goto out;

	}



	error = gfs2_quota_hold(dip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);

	if (error)

		goto out_put;

		goto out;



	/*  Count the number of leaves  */

	bh = leaf_bh;
@@ -1942,8 +1937,6 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len, 
out_rlist:

	gfs2_rlist_free(&rlist);

	gfs2_quota_unhold(dip);

out_put:

	gfs2_qadata_put(dip);

out:

	kfree(ht);

	return error;

fs/gfs2/file.c

+6 −16
Original line number Diff line number Diff line
@@ -366,7 +366,6 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 
	u64 pos = page->index << PAGE_CACHE_SHIFT;

	unsigned int data_blocks, ind_blocks, rblocks;

	struct gfs2_holder gh;

	struct gfs2_qadata *qa;

	loff_t size;

	int ret;
@@ -397,14 +396,13 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 
		goto out_unlock;

	}



	ret = -ENOMEM;

	qa = gfs2_qadata_get(ip);

	if (qa == NULL)

	ret = gfs2_rindex_update(sdp);

	if (ret)

		goto out_unlock;



	ret = gfs2_quota_lock_check(ip);

	if (ret)

		goto out_alloc_put;

		goto out_unlock;

	gfs2_write_calc_reserv(ip, PAGE_CACHE_SIZE, &data_blocks, &ind_blocks);

	ret = gfs2_inplace_reserve(ip, data_blocks + ind_blocks);

	if (ret)
@@ -451,8 +449,6 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 
	gfs2_inplace_release(ip);

out_quota_unlock:

	gfs2_quota_unlock(ip);

out_alloc_put:

	gfs2_qadata_put(ip);

out_unlock:

	gfs2_glock_dq(&gh);

out:
@@ -764,7 +760,6 @@ static long gfs2_fallocate(struct file *file, int mode, loff_t offset, 
	struct gfs2_inode *ip = GFS2_I(inode);

	unsigned int data_blocks = 0, ind_blocks = 0, rblocks;

	loff_t bytes, max_bytes;

	struct gfs2_qadata *qa;

	int error;

	const loff_t pos = offset;

	const loff_t count = len;
@@ -804,15 +799,13 @@ static long gfs2_fallocate(struct file *file, int mode, loff_t offset, 
			offset += bytes;

			continue;

		}

		qa = gfs2_qadata_get(ip);

		if (!qa) {

			error = -ENOMEM;

		error = gfs2_rindex_update(sdp);

		if (error)

			goto out_unlock;

		}



		error = gfs2_quota_lock_check(ip);

		if (error)

			goto out_alloc_put;

			goto out_unlock;



retry:

		gfs2_write_calc_reserv(ip, bytes, &data_blocks, &ind_blocks);
@@ -852,7 +845,6 @@ static long gfs2_fallocate(struct file *file, int mode, loff_t offset, 
		offset += max_bytes;

		gfs2_inplace_release(ip);

		gfs2_quota_unlock(ip);

		gfs2_qadata_put(ip);

	}



	if (error == 0)
@@ -863,8 +855,6 @@ static long gfs2_fallocate(struct file *file, int mode, loff_t offset, 
	gfs2_inplace_release(ip);

out_qunlock:

	gfs2_quota_unlock(ip);

out_alloc_put:

	gfs2_qadata_put(ip);

out_unlock:

	gfs2_glock_dq(&ip->i_gh);

out_uninit:

fs/gfs2/incore.h

+5 −8
Original line number Diff line number Diff line
@@ -289,16 +289,14 @@ struct gfs2_glock { 


#define GFS2_MIN_LVB_SIZE 32	/* Min size of LVB that gfs2 supports */



struct gfs2_qadata { /* quota allocation data */

	/* Quota stuff */

	struct gfs2_quota_data *qa_qd[2*MAXQUOTAS];

	struct gfs2_holder qa_qd_ghs[2*MAXQUOTAS];

	unsigned int qa_qd_num;

};



struct gfs2_blkreserv {

	u32 rs_requested; /* Filled in by caller of gfs2_inplace_reserve() */

	struct gfs2_holder rs_rgd_gh; /* Filled in by gfs2_inplace_reserve() */



	/* ancillary quota stuff */

	struct gfs2_quota_data *rs_qa_qd[2 * MAXQUOTAS];

	struct gfs2_holder rs_qa_qd_ghs[2 * MAXQUOTAS];

	unsigned int rs_qa_qd_num;

};



enum {
@@ -319,7 +317,6 @@ struct gfs2_inode { 
	struct gfs2_glock *i_gl; /* Move into i_gh? */

	struct gfs2_holder i_iopen_gh;

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

	struct gfs2_qadata *i_qadata; /* quota allocation data */

	struct gfs2_blkreserv *i_res; /* resource group block reservation */

	struct gfs2_rgrpd *i_rgd;

	u64 i_goal;	/* goal block for allocations */