diff options
author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 00:29:51 -0500 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 00:29:51 -0500 |
commit | cb7a97d01521797cad9f63e8478403c3e51fea49 (patch) | |
tree | 84cddf20369f82f10c1c3712e6cce20dd1b9d863 /fs/dquot.c | |
parent | 0335cb76aa3fa913a2164bc9b669e5aef9d56fa3 (diff) | |
parent | a6525042bfdfcab128bd91fad264de10fd24a55e (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'fs/dquot.c')
-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) | |||
2090 | } | 2090 | } |
2091 | if (di->dqb_valid & QIF_BTIME) { | 2091 | if (di->dqb_valid & QIF_BTIME) { |
2092 | dm->dqb_btime = di->dqb_btime; | 2092 | dm->dqb_btime = di->dqb_btime; |
2093 | check_blim = 1; | ||
2093 | __set_bit(DQ_LASTSET_B + QIF_BTIME_B, &dquot->dq_flags); | 2094 | __set_bit(DQ_LASTSET_B + QIF_BTIME_B, &dquot->dq_flags); |
2094 | } | 2095 | } |
2095 | if (di->dqb_valid & QIF_ITIME) { | 2096 | if (di->dqb_valid & QIF_ITIME) { |
2096 | dm->dqb_itime = di->dqb_itime; | 2097 | dm->dqb_itime = di->dqb_itime; |
2098 | check_ilim = 1; | ||
2097 | __set_bit(DQ_LASTSET_B + QIF_ITIME_B, &dquot->dq_flags); | 2099 | __set_bit(DQ_LASTSET_B + QIF_ITIME_B, &dquot->dq_flags); |
2098 | } | 2100 | } |
2099 | 2101 | ||