Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-30 14:52:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

quota: sb_quota state flags cleanup

Browse Source 
- 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>
This commit is contained in:
Dmitry Monakhov 2010-02-16 08:31:49 +03:00 committed by Jan Kara
parent 8696391896
commit ad1e6e8da9
3 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/quota/dquot.c
View File

@ -1301,7 +1301,7 @@ int dquot_initialize(struct inode *inode, int type)
{ {
unsigned int id = 0; unsigned int id = 0;
int cnt, ret = 0; int cnt, ret = 0;
struct dquot *got[MAXQUOTAS] = { NULL, NULL }; struct dquot *got[MAXQUOTAS];
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
qsize_t rsv; qsize_t rsv;
@ -1312,6 +1312,7 @@ int dquot_initialize(struct inode *inode, int type)
/* First get references to structures we might need. */ /* First get references to structures we might need. */
for (cnt = 0; cnt < MAXQUOTAS; cnt++) { for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
got[cnt] = NULL;
if (type != -1 && cnt != type) if (type != -1 && cnt != type)
continue; continue;
switch (cnt) { switch (cnt) {

15
include/linux/quota.h
View File

@ -357,26 +357,25 @@ enum {
#define DQUOT_STATE_FLAGS (DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED | \ #define DQUOT_STATE_FLAGS (DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED | \
DQUOT_SUSPENDED) DQUOT_SUSPENDED)
/* Other quota flags */ /* 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 * system file and user cannot
* touch it. Filesystem is * touch it. Filesystem is
* responsible for setting * responsible for setting
* S_NOQUOTA, S_NOATIME flags * 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) static inline unsigned int dquot_state_flag(unsigned int flags, int type)
{ {
if (type == USRQUOTA) return flags << _DQUOT_STATE_FLAGS * type;
return flags;
return flags << _DQUOT_STATE_FLAGS;
} }
static inline unsigned int dquot_generic_flag(unsigned int flags, int type) static inline unsigned int dquot_generic_flag(unsigned int flags, int type)
{ {
if (type == USRQUOTA) return (flags >> _DQUOT_STATE_FLAGS * type) & DQUOT_STATE_FLAGS;
return flags;
return flags >> _DQUOT_STATE_FLAGS;
} }
#ifdef CONFIG_QUOTA_NETLINK_INTERFACE #ifdef CONFIG_QUOTA_NETLINK_INTERFACE

31
include/linux/quotaops.h
View File

@ -79,53 +79,56 @@ static inline struct mem_dqinfo *sb_dqinfo(struct super_block *sb, int type)
* Functions for checking status of quota * Functions for checking status of quota
*/ */
static inline int sb_has_quota_usage_enabled(struct super_block *sb, int type) static inline bool sb_has_quota_usage_enabled(struct super_block *sb, int type)
{ {
return sb_dqopt(sb)->flags & return sb_dqopt(sb)->flags &
dquot_state_flag(DQUOT_USAGE_ENABLED, type); dquot_state_flag(DQUOT_USAGE_ENABLED, type);
} }
static inline int sb_has_quota_limits_enabled(struct super_block *sb, int type) static inline bool sb_has_quota_limits_enabled(struct super_block *sb, int type)
{ {
return sb_dqopt(sb)->flags & return sb_dqopt(sb)->flags &
dquot_state_flag(DQUOT_LIMITS_ENABLED, type); dquot_state_flag(DQUOT_LIMITS_ENABLED, type);
} }
static inline int sb_has_quota_suspended(struct super_block *sb, int type) static inline bool sb_has_quota_suspended(struct super_block *sb, int type)
{ {
return sb_dqopt(sb)->flags & return sb_dqopt(sb)->flags &
dquot_state_flag(DQUOT_SUSPENDED, type); dquot_state_flag(DQUOT_SUSPENDED, type);
} }
static inline int sb_any_quota_suspended(struct super_block *sb) static inline unsigned sb_any_quota_suspended(struct super_block *sb)
{ {
return sb_has_quota_suspended(sb, USRQUOTA) || unsigned type, tmsk = 0;
sb_has_quota_suspended(sb, GRPQUOTA); for (type = 0; type < MAXQUOTAS; type++)
tmsk |= sb_has_quota_suspended(sb, type) << type;
return tmsk;
} }
/* Does kernel know about any quota information for given sb + type? */ /* Does kernel know about any quota information for given sb + type? */
static inline int sb_has_quota_loaded(struct super_block *sb, int type) static inline bool sb_has_quota_loaded(struct super_block *sb, int type)
{ {
/* Currently if anything is on, then quota usage is on as well */ /* Currently if anything is on, then quota usage is on as well */
return sb_has_quota_usage_enabled(sb, type); return sb_has_quota_usage_enabled(sb, type);
} }
static inline int sb_any_quota_loaded(struct super_block *sb) static inline unsigned sb_any_quota_loaded(struct super_block *sb)
{ {
return sb_has_quota_loaded(sb, USRQUOTA) || unsigned type, tmsk = 0;
sb_has_quota_loaded(sb, GRPQUOTA); for (type = 0; type < MAXQUOTAS; type++)
tmsk |= sb_has_quota_loaded(sb, type) << type;
return tmsk;
} }
static inline int sb_has_quota_active(struct super_block *sb, int type) static inline bool sb_has_quota_active(struct super_block *sb, int type)
{ {
return sb_has_quota_loaded(sb, type) && return sb_has_quota_loaded(sb, type) &&
!sb_has_quota_suspended(sb, type); !sb_has_quota_suspended(sb, type);
} }
static inline int sb_any_quota_active(struct super_block *sb) static inline unsigned sb_any_quota_active(struct super_block *sb)
{ {
return sb_has_quota_active(sb, USRQUOTA) || return sb_any_quota_loaded(sb) & ~sb_any_quota_suspended(sb);
sb_has_quota_active(sb, GRPQUOTA);
} }
/* /*