Commit 703df114 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Two quota=account mode fixes 



Make sure we don't skip accounting for quota changes with the
quota=account mount option.

Reviewed-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 13587069

fs/gfs2/quota.c

+2 −4
Original line number Diff line number Diff line
@@ -1083,8 +1083,7 @@ int gfs2_quota_lock(struct gfs2_inode *ip, kuid_t uid, kgid_t gid) 
	u32 x;

	int error;



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

	    sdp->sd_args.ar_quota != GFS2_QUOTA_QUIET)

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

		return 0;



	error = gfs2_quota_hold(ip, uid, gid);
@@ -1285,8 +1284,7 @@ void gfs2_quota_change(struct gfs2_inode *ip, s64 change, 
	u32 x;

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



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

	    sdp->sd_args.ar_quota != GFS2_QUOTA_QUIET) ||

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

	    gfs2_assert_warn(sdp, change))

		return;

	if (ip->i_diskflags & GFS2_DIF_SYSTEM)

fs/gfs2/quota.h

+1 −2
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ static inline int gfs2_quota_lock_check(struct gfs2_inode *ip, 
	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 &&

	    sdp->sd_args.ar_quota != GFS2_QUOTA_QUIET)

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

		return 0;

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

	if (ret)