diff options
| author | Jan Kara <jack@suse.cz> | 2009-01-07 18:07:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-08 08:31:01 -0800 |
| commit | e04a88a920ff36d03641e1b9c01b7960d94209f1 (patch) | |
| tree | 0c4bc724372953bdcf027eea2daf87bcfd8e4a2f | |
| parent | 87d1fda5e2ff6527740604a7918fc273b6f9ae13 (diff) | |
| download | blackbird-op-linux-e04a88a920ff36d03641e1b9c01b7960d94209f1.tar.gz blackbird-op-linux-e04a88a920ff36d03641e1b9c01b7960d94209f1.zip | |
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>
| -rw-r--r-- | fs/dquot.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/dquot.c b/fs/dquot.c index 61bfff64e5af..48c0571f831d 100644 --- a/fs/dquot.c +++ b/fs/dquot.c @@ -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); } |
