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

Commit d82661d9 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Streamline quota lock/check for no-quota case 



This patch streamlines the quota checking in the "no quota" case by
making the check inline in the calling function, thus reducing the
number of function calls. Eventually we might be able to remove the
checks from the gfs2_quota_lock() and gfs2_quota_check() functions, but
currently we can't as there are a very few places in the code which need
to call these functions directly still.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
Cc: Abhijith Das <adas@redhat.com>
parent 860b25d4

fs/gfs2/bmap.c

+1 −5
Original line number Diff line number Diff line
@@ -903,14 +903,10 @@ static int do_grow(struct gfs2_inode *ip, u64 size) 
	if (!al)

		return -ENOMEM;



	error = gfs2_quota_lock(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);

	error = gfs2_quota_lock_check(ip);

	if (error)

		goto out;



	error = gfs2_quota_check(ip, ip->i_inode.i_uid, ip->i_inode.i_gid);

	if (error)

		goto out_gunlock_q;



	al->al_requested = sdp->sd_max_height + RES_DATA;



	error = gfs2_inplace_reserve(ip);

fs/gfs2/eattr.c

+1 −5
Original line number Diff line number Diff line
@@ -686,14 +686,10 @@ static int ea_alloc_skeleton(struct gfs2_inode *ip, struct gfs2_ea_request *er, 
	if (!al)

		return -ENOMEM;



	error = gfs2_quota_lock(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);

	error = gfs2_quota_lock_check(ip);

	if (error)

		goto out;



	error = gfs2_quota_check(ip, ip->i_inode.i_uid, ip->i_inode.i_gid);

	if (error)

		goto out_gunlock_q;



	al->al_requested = blks;



	error = gfs2_inplace_reserve(ip);

fs/gfs2/ops_address.c

+1 −5
Original line number Diff line number Diff line
@@ -653,14 +653,10 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, 
			goto out_unlock;

		}



		error = gfs2_quota_lock(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);

		error = gfs2_quota_lock_check(ip);

		if (error)

			goto out_alloc_put;



		error = gfs2_quota_check(ip, ip->i_inode.i_uid, ip->i_inode.i_gid);

		if (error)

			goto out_qunlock;



		al->al_requested = data_blocks + ind_blocks;

		error = gfs2_inplace_reserve(ip);

		if (error)

fs/gfs2/ops_file.c

+1 −4
Original line number Diff line number Diff line
@@ -369,12 +369,9 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct page *page) 
	if (al == NULL)

		goto out_unlock;



	ret = gfs2_quota_lock(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);

	ret = gfs2_quota_lock_check(ip);

	if (ret)

		goto out_alloc_put;

	ret = gfs2_quota_check(ip, ip->i_inode.i_uid, ip->i_inode.i_gid);

	if (ret)

		goto out_quota_unlock;

	al->al_requested = data_blocks + ind_blocks;

	ret = gfs2_inplace_reserve(ip);

	if (ret)

fs/gfs2/ops_inode.c

+2 −10
Original line number Diff line number Diff line
@@ -205,14 +205,10 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir, 
			goto out_gunlock;

		}



		error = gfs2_quota_lock(dip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);

		error = gfs2_quota_lock_check(dip);

		if (error)

			goto out_alloc;



		error = gfs2_quota_check(dip, dip->i_inode.i_uid, dip->i_inode.i_gid);

		if (error)

			goto out_gunlock_q;



		al->al_requested = sdp->sd_max_dirres;



		error = gfs2_inplace_reserve(dip);
@@ -725,14 +721,10 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry, 
			goto out_gunlock;

		}



		error = gfs2_quota_lock(ndip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);

		error = gfs2_quota_lock_check(ndip);

		if (error)

			goto out_alloc;



		error = gfs2_quota_check(ndip, ndip->i_inode.i_uid, ndip->i_inode.i_gid);

		if (error)

			goto out_gunlock_q;



		al->al_requested = sdp->sd_max_dirres;



		error = gfs2_inplace_reserve(ndip);