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

Commit 4b8e1106 authored by Chengguang Xu's avatar Chengguang Xu Committed by Jan Kara
Browse files

quota: fix condition for resetting time limit in do_set_dqblk() 



We reset time limit when current usage is smaller
or equal to soft limit in other place, so follow
this rule in do_set_dqblk().

Signed-off-by: default avatarChengguang Xu <cgxu519@zoho.com.cn>
Link: https://lore.kernel.org/r/20190724053216.19392-1-cgxu519@zoho.com.cn


Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent b6aeffc5

fs/quota/dquot.c

+2 −2
Original line number Diff line number Diff line
@@ -2731,7 +2731,7 @@ static int do_set_dqblk(struct dquot *dquot, struct qc_dqblk *di) 


	if (check_blim) {

		if (!dm->dqb_bsoftlimit ||

		    dm->dqb_curspace + dm->dqb_rsvspace < dm->dqb_bsoftlimit) {

		    dm->dqb_curspace + dm->dqb_rsvspace <= dm->dqb_bsoftlimit) {

			dm->dqb_btime = 0;

			clear_bit(DQ_BLKS_B, &dquot->dq_flags);

		} else if (!(di->d_fieldmask & QC_SPC_TIMER))
@@ -2740,7 +2740,7 @@ static int do_set_dqblk(struct dquot *dquot, struct qc_dqblk *di) 
	}

	if (check_ilim) {

		if (!dm->dqb_isoftlimit ||

		    dm->dqb_curinodes < dm->dqb_isoftlimit) {

		    dm->dqb_curinodes <= dm->dqb_isoftlimit) {

			dm->dqb_itime = 0;

			clear_bit(DQ_INODES_B, &dquot->dq_flags);

		} else if (!(di->d_fieldmask & QC_INO_TIMER))