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

Commit f4108a60 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

gfs2: Split NO_QUOTA_CHANGE inot NO_UID_QUTOA_CHANGE and NO_GID_QUTOA_CHANGE 



Split NO_QUOTA_CHANGE into NO_UID_QUTOA_CHANGE and NO_GID_QUTOA_CHANGE
so the constants may be well typed.

Cc: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 393551e9

fs/gfs2/bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ static int trunc_dealloc(struct gfs2_inode *ip, u64 size) 
	if (error)

		return error;



	error = gfs2_quota_hold(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);

	error = gfs2_quota_hold(ip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);

	if (error)

		return error;

fs/gfs2/dir.c

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

		return -ENOMEM;



	error = gfs2_quota_hold(dip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);

	error = gfs2_quota_hold(dip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);

	if (error)

		goto out;

fs/gfs2/inode.c

+5 −5
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static int link_dinode(struct gfs2_inode *dip, const struct qstr *name, 
	if (error)

		return error;



	error = gfs2_quota_lock(dip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);

	error = gfs2_quota_lock(dip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);

	if (error)

		goto fail;
@@ -1589,15 +1589,15 @@ static int setattr_chown(struct inode *inode, struct iattr *attr) 
	ngid = attr->ia_gid;



	if (!(attr->ia_valid & ATTR_UID) || ouid == nuid)

		ouid = nuid = NO_QUOTA_CHANGE;

		ouid = nuid = NO_UID_QUOTA_CHANGE;

	if (!(attr->ia_valid & ATTR_GID) || ogid == ngid)

		ogid = ngid = NO_QUOTA_CHANGE;

		ogid = ngid = NO_GID_QUOTA_CHANGE;



	error = gfs2_quota_lock(ip, nuid, ngid);

	if (error)

		return error;



	if (ouid != NO_QUOTA_CHANGE || ogid != NO_QUOTA_CHANGE) {

	if (ouid != NO_UID_QUOTA_CHANGE || ogid != NO_GID_QUOTA_CHANGE) {

		error = gfs2_quota_check(ip, nuid, ngid);

		if (error)

			goto out_gunlock_q;
@@ -1611,7 +1611,7 @@ static int setattr_chown(struct inode *inode, struct iattr *attr) 
	if (error)

		goto out_end_trans;



	if (ouid != NO_QUOTA_CHANGE || ogid != NO_QUOTA_CHANGE) {

	if (ouid != NO_UID_QUOTA_CHANGE || ogid != NO_GID_QUOTA_CHANGE) {

		u64 blocks = gfs2_get_inode_blocks(&ip->i_inode);

		gfs2_quota_change(ip, -blocks, ouid, ogid);

		gfs2_quota_change(ip, blocks, nuid, ngid);

fs/gfs2/quota.c

+2 −2
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid) 
	ip->i_res->rs_qa_qd_num++;

	qd++;



	if (uid != NO_QUOTA_CHANGE && uid != ip->i_inode.i_uid) {

	if (uid != NO_UID_QUOTA_CHANGE && uid != ip->i_inode.i_uid) {

		error = qdsb_get(sdp, QUOTA_USER, uid, qd);

		if (error)

			goto out;
@@ -532,7 +532,7 @@ int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid) 
		qd++;

	}



	if (gid != NO_QUOTA_CHANGE && gid != ip->i_inode.i_gid) {

	if (gid != NO_GID_QUOTA_CHANGE && gid != ip->i_inode.i_gid) {

		error = qdsb_get(sdp, QUOTA_GROUP, gid, qd);

		if (error)

			goto out;

fs/gfs2/quota.h

+3 −2
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ struct gfs2_inode; 
struct gfs2_sbd;

struct shrink_control;



#define NO_QUOTA_CHANGE ((u32)-1)

#define NO_UID_QUOTA_CHANGE INVALID_UID

#define NO_GID_QUOTA_CHANGE INVALID_GID



extern int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid);

extern void gfs2_quota_unhold(struct gfs2_inode *ip);
@@ -41,7 +42,7 @@ static inline int gfs2_quota_lock_check(struct gfs2_inode *ip) 
	int ret;

	if (sdp->sd_args.ar_quota == GFS2_QUOTA_OFF)

		return 0;

	ret = gfs2_quota_lock(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);

	ret = gfs2_quota_lock(ip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);

	if (ret)

		return ret;

	if (sdp->sd_args.ar_quota != GFS2_QUOTA_ON)