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

Commit e04a88a9 authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds
Browse files

quota: don't set grace time when user isn't above softlimit 



do_set_dqblk() allowed SETDQBLK quotactl to set user's grace time even if
user was not above his softlimit.  This does not make much sence and by
coincidence causes quota code to omit softlimit warning when user really
exceeds softlimit.  This patch makes do_set_dqblk() reset user's grace
time if he has not exceeded softlimit.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 87d1fda5

fs/dquot.c

+2 −0
Original line number Diff line number Diff line
@@ -2090,10 +2090,12 @@ static int do_set_dqblk(struct dquot *dquot, struct if_dqblk *di) 
	}

	if (di->dqb_valid & QIF_BTIME) {

		dm->dqb_btime = di->dqb_btime;

		check_blim = 1;

		__set_bit(DQ_LASTSET_B + QIF_BTIME_B, &dquot->dq_flags);

	}

	if (di->dqb_valid & QIF_ITIME) {

		dm->dqb_itime = di->dqb_itime;

		check_ilim = 1;

		__set_bit(DQ_LASTSET_B + QIF_ITIME_B, &dquot->dq_flags);

	}