Commit e04a88a9 authored Jan 07, 2009 by Jan Kara Committed by Linus Torvalds Jan 08, 2009

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: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus 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);
		}

Admin message