quota: sb_quota state flags cleanup

- remove hardcoded USRQUOTA/GRPQUOTA flags
- convert int to bool for appropriate functions

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Jan Kara <jack@suse.cz>

1 files changed, 7 insertions, 8 deletions

diff --git a/include/linux/quota.h b/include/linux/quota.h
index 570348cbccb1..92547a57e25a 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -357,26 +357,25 @@ enum {
 #define DQUOT_STATE_FLAGS       (DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED | \
                                  DQUOT_SUSPENDED)
 /* Other quota flags */
-#define DQUOT_QUOTA_SYS_FILE    (1 << 6)        /* Quota file is a special
+#define DQUOT_STATE_LAST        (_DQUOT_STATE_FLAGS * MAXQUOTAS)
+#define DQUOT_QUOTA_SYS_FILE    (1 << DQUOT_STATE_LAST)
+                                                /* Quota file is a special
                                                  * system file and user cannot
                                                  * touch it. Filesystem is
                                                  * responsible for setting
                                                  * S_NOQUOTA, S_NOATIME flags
                                                  */
-#define DQUOT_NEGATIVE_USAGE    (1 << 7)        /* Allow negative quota usage */
+#define DQUOT_NEGATIVE_USAGE    (1 << (DQUOT_STATE_LAST + 1))
+                                               /* Allow negative quota usage */
 
 static inline unsigned int dquot_state_flag(unsigned int flags, int type)
 {
-        if (type == USRQUOTA)
-                return flags;
-        return flags << _DQUOT_STATE_FLAGS;
+        return flags << _DQUOT_STATE_FLAGS * type;
 }
 
 static inline unsigned int dquot_generic_flag(unsigned int flags, int type)
 {
-        if (type == USRQUOTA)
-                return flags;
-        return flags >> _DQUOT_STATE_FLAGS;
+        return (flags >> _DQUOT_STATE_FLAGS * type) & DQUOT_STATE_FLAGS;
 }
 
 #ifdef CONFIG_QUOTA_NETLINK_INTERFACE