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@xxxxxxx>
---
Andrew, would you merge this patch for -mm? It's against linux-next so
it should apply fine to your tree. Thanks. The bug is not serious so the
fix can definitely wait till 2.6.29 merge window.
fs/dquot.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/fs/dquot.c b/fs/dquot.c
index 61bfff6..48c0571 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);
}
--
1.6.0.2
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
