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

Commit 802ec9b6 authored by Abhijith Das's avatar Abhijith Das Committed by Steven Whitehouse
Browse files

GFS2: Allow gfs2 to update quota usage values through the quotactl interface 



With this patch the gfs2_set_dqblk() function will be able to update the
quota usage block count (FS_DQ_BCOUNT) in addition to the already supported
FS_DQ_BHARD (limit) and FS_DQ_BSOFT (warn) fields of the dquot structure.

Signed-off-by: default avatarAbhi Das <adas@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent edc221d0

fs/gfs2/quota.c

+11 −2
Original line number Diff line number Diff line
@@ -666,6 +666,10 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc, 
			qp->qu_limit = cpu_to_be64(fdq->d_blk_hardlimit >> sdp->sd_fsb2bb_shift);

			qd->qd_qb.qb_limit = qp->qu_limit;

		}

		if (fdq->d_fieldmask & FS_DQ_BCOUNT) {

			qp->qu_value = cpu_to_be64(fdq->d_bcount >> sdp->sd_fsb2bb_shift);

			qd->qd_qb.qb_value = qp->qu_value;

		}

	}



	/* Write the quota into the quota file on disk */
@@ -1509,7 +1513,7 @@ static int gfs2_get_dqblk(struct super_block *sb, int type, qid_t id, 
}



/* GFS2 only supports a subset of the XFS fields */

#define GFS2_FIELDMASK (FS_DQ_BSOFT|FS_DQ_BHARD)

#define GFS2_FIELDMASK (FS_DQ_BSOFT|FS_DQ_BHARD|FS_DQ_BCOUNT)



static int gfs2_set_dqblk(struct super_block *sb, int type, qid_t id,

			  struct fs_disk_quota *fdq)
@@ -1569,9 +1573,15 @@ static int gfs2_set_dqblk(struct super_block *sb, int type, qid_t id, 
	if ((fdq->d_fieldmask & FS_DQ_BSOFT) &&

	    ((fdq->d_blk_softlimit >> sdp->sd_fsb2bb_shift) == be64_to_cpu(qd->qd_qb.qb_warn)))

		fdq->d_fieldmask ^= FS_DQ_BSOFT;



	if ((fdq->d_fieldmask & FS_DQ_BHARD) &&

	    ((fdq->d_blk_hardlimit >> sdp->sd_fsb2bb_shift) == be64_to_cpu(qd->qd_qb.qb_limit)))

		fdq->d_fieldmask ^= FS_DQ_BHARD;



	if ((fdq->d_fieldmask & FS_DQ_BCOUNT) &&

	    ((fdq->d_bcount >> sdp->sd_fsb2bb_shift) == be64_to_cpu(qd->qd_qb.qb_value)))

		fdq->d_fieldmask ^= FS_DQ_BCOUNT;



	if (fdq->d_fieldmask == 0)

		goto out_i;
@@ -1620,4 +1630,3 @@ const struct quotactl_ops gfs2_quotactl_ops = { 
	.get_dqblk	= gfs2_get_dqblk,

	.set_dqblk	= gfs2_set_dqblk,

};