diff options
| author | Chengguang Xu <cgxu519@zoho.com.cn> | 2019-07-24 13:32:16 +0800 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2019-07-31 12:04:42 +0200 |
| commit | 4b8e1106dd95d4d7f2781258d3871b445f3928ce (patch) | |
| tree | 1fe3a2ff1a9eec916bb8c39427c06c0f9004e75b /fs/quota | |
| parent | b6aeffc5852f39db6e6e56da5327d0c43ac3c30a (diff) | |
| download | linux-stable-4b8e1106dd95d4d7f2781258d3871b445f3928ce.tar.gz linux-stable-4b8e1106dd95d4d7f2781258d3871b445f3928ce.tar.bz2 linux-stable-4b8e1106dd95d4d7f2781258d3871b445f3928ce.zip | |
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: Chengguang Xu <cgxu519@zoho.com.cn>
Link: https://lore.kernel.org/r/20190724053216.19392-1-cgxu519@zoho.com.cn
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/quota')
| -rw-r--r-- | fs/quota/dquot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index be9c471cdbc8..6e826b454082 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -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)) |