quota: check time limit when back out space/inode change

When we fail from allocating inode/space, we back out
the change we already did. In a special case which has
exceeded soft limit by the change, we should also check
time limit and reset it properly.

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 67e534dbfc0e87db79f9151da99f77a24b487fd7..9ad72ea7f71f5d71608c470992c871aa7bbe2f15 100644 (file)
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -1681,13 +1681,11 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)
                                if (!dquots[cnt])
                                        continue;
                                spin_lock(&dquots[cnt]->dq_dqb_lock);
-                               if (reserve) {
-                                       dquots[cnt]->dq_dqb.dqb_rsvspace -=
-                                                                       number;
-                               } else {
-                                       dquots[cnt]->dq_dqb.dqb_curspace -=
-                                                                       number;
-                               }
+                               if (reserve)
+                                       dquot_free_reserved_space(dquots[cnt],
+                                                                 number);
+                               else
+                                       dquot_decr_space(dquots[cnt], number);
                                spin_unlock(&dquots[cnt]->dq_dqb_lock);
                        }
                        spin_unlock(&inode->i_lock);
@@ -1738,7 +1736,7 @@ int dquot_alloc_inode(struct inode *inode)
                                        continue;
                                /* Back out changes we already did */
                                spin_lock(&dquots[cnt]->dq_dqb_lock);
-                               dquots[cnt]->dq_dqb.dqb_curinodes--;
+                               dquot_decr_inodes(dquots[cnt], 1);
                                spin_unlock(&dquots[cnt]->dq_dqb_lock);
                        }
                        goto warn_put_all;