Messages in this thread Patch in this message | | | From | Yangtao Li <> | Subject | [PATCH] quota: add ALLQUOTA macro | Date | Thu, 13 Apr 2023 23:41:51 +0800 |
| |
Convert to use macro instead of raw number.
Signed-off-by: Yangtao Li <frank.li@vivo.com> --- fs/quota/dquot.c | 20 ++++++++++---------- include/uapi/linux/quota.h | 1 + 2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 10b46c403bdb..62ee6cb32e57 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -640,7 +640,7 @@ int dquot_writeback_dquots(struct super_block *sb, int type) WARN_ON_ONCE(!rwsem_is_locked(&sb->s_umount)); for (cnt = 0; cnt < MAXQUOTAS; cnt++) { - if (type != -1 && cnt != type) + if (type != ALLQUOTA && cnt != type) continue; if (!sb_has_quota_active(sb, cnt)) continue; @@ -675,7 +675,7 @@ int dquot_writeback_dquots(struct super_block *sb, int type) } for (cnt = 0; cnt < MAXQUOTAS; cnt++) - if ((cnt == type || type == -1) && sb_has_quota_active(sb, cnt) + if ((cnt == type || type == ALLQUOTA) && sb_has_quota_active(sb, cnt) && info_dirty(&dqopt->info[cnt])) sb->dq_op->write_info(sb, cnt); dqstats_inc(DQST_SYNCS); @@ -714,7 +714,7 @@ int dquot_quota_sync(struct super_block *sb, int type) * that userspace sees the changes. */ for (cnt = 0; cnt < MAXQUOTAS; cnt++) { - if (type != -1 && cnt != type) + if (type != ALLQUOTA && cnt != type) continue; if (!sb_has_quota_active(sb, cnt)) continue; @@ -948,7 +948,7 @@ static int dqinit_needed(struct inode *inode, int type) return 0; dquots = i_dquot(inode); - if (type != -1) + if (type != ALLQUOTA) return !dquots[type]; for (cnt = 0; cnt < MAXQUOTAS; cnt++) if (!dquots[cnt]) @@ -1391,7 +1391,7 @@ static int __dquot_initialize(struct inode *inode, int type) int rc; struct dquot *dquot; - if (type != -1 && cnt != type) + if (type != ALLQUOTA && cnt != type) continue; /* * The i_dquot should have been initialized in most cases, @@ -1440,7 +1440,7 @@ static int __dquot_initialize(struct inode *inode, int type) if (IS_NOQUOTA(inode)) goto out_lock; for (cnt = 0; cnt < MAXQUOTAS; cnt++) { - if (type != -1 && cnt != type) + if (type != ALLQUOTA && cnt != type) continue; /* Avoid races with quotaoff() */ if (!sb_has_quota_active(sb, cnt)) @@ -1478,7 +1478,7 @@ static int __dquot_initialize(struct inode *inode, int type) int dquot_initialize(struct inode *inode) { - return __dquot_initialize(inode, -1); + return __dquot_initialize(inode, ALLQUOTA); } EXPORT_SYMBOL(dquot_initialize); @@ -2131,7 +2131,7 @@ static void vfs_cleanup_quota_inode(struct super_block *sb, int type) } /* - * Turn quota off on a device. type == -1 ==> quotaoff for all types (umount) + * Turn quota off on a device. type == ALLQUOTA ==> quotaoff for all types (umount) */ int dquot_disable(struct super_block *sb, int type, unsigned int flags) { @@ -2158,7 +2158,7 @@ int dquot_disable(struct super_block *sb, int type, unsigned int flags) return 0; for (cnt = 0; cnt < MAXQUOTAS; cnt++) { - if (type != -1 && cnt != type) + if (type != ALLQUOTA && cnt != type) continue; if (!sb_has_quota_loaded(sb, cnt)) continue; @@ -2392,7 +2392,7 @@ int dquot_resume(struct super_block *sb, int type) up_read(&sb->s_umount); for (cnt = 0; cnt < MAXQUOTAS; cnt++) { - if (type != -1 && cnt != type) + if (type != ALLQUOTA && cnt != type) continue; if (!sb_has_quota_suspended(sb, cnt)) continue; diff --git a/include/uapi/linux/quota.h b/include/uapi/linux/quota.h index f17c9636a859..1707ed43365a 100644 --- a/include/uapi/linux/quota.h +++ b/include/uapi/linux/quota.h @@ -38,6 +38,7 @@ #define __DQUOT_VERSION__ "dquot_6.6.0" #define MAXQUOTAS 3 +#define ALLQUOTA -1 #define USRQUOTA 0 /* element used for user quotas */ #define GRPQUOTA 1 /* element used for group quotas */ #define PRJQUOTA 2 /* element used for project quotas */ -- 2.35.1
| |