quota: Make _SUSPENDED just a flag

Upto now, DQUOT_USR_SUSPENDED behaved like a state - i.e., either quota
was enabled or suspended or none. Now allowed states are 0, ENABLED,
ENABLED | SUSPENDED. This will be useful later when we implement separate
enabling of quota usage tracking and limits enforcement because we need to
keep track of a state which has been suspended.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/fs/dquot.c b/fs/dquot.c
index c88330602ddd..22340c610e1a 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -1570,18 +1570,20 @@ static inline void reset_enable_flags(struct quota_info *dqopt, int type,
 {
         switch (type) {
                 case USRQUOTA:
-                        dqopt->flags &= ~DQUOT_USR_ENABLED;
                         if (remount)
                                 dqopt->flags |= DQUOT_USR_SUSPENDED;
-                        else
+                        else {
+                                dqopt->flags &= ~DQUOT_USR_ENABLED;
                                 dqopt->flags &= ~DQUOT_USR_SUSPENDED;
+                        }
                         break;
                 case GRPQUOTA:
-                        dqopt->flags &= ~DQUOT_GRP_ENABLED;
                         if (remount)
                                 dqopt->flags |= DQUOT_GRP_SUSPENDED;
-                        else
+                        else {
+                                dqopt->flags &= ~DQUOT_GRP_ENABLED;
                                 dqopt->flags &= ~DQUOT_GRP_SUSPENDED;
+                        }
                         break;
         }
 }