quota: rename dquot_active() to inode_quota_active()

[ Upstream commit 4b9bdfa16535de8f49bf954aeed0f525ee2fc322 ]

Now we have a helper function dquot_dirty() to determine if dquot has
DQ_MOD_B bit. dquot_active() can easily be misunderstood as a helper
function to determine if dquot has DQ_ACTIVE_B bit. So we avoid this by
renaming it to inode_quota_active() and later on we will add the helper
function dquot_active() to determine if dquot has DQ_ACTIVE_B bit.

Signed-off-by: Baokun Li <libaokun1@huawei.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Message-Id: <20230630110822.3881712-3-libaokun1@huawei.com>
Stable-dep-of: dabc8b207566 ("quota: fix dqput() to follow the guarantees dquot_srcu should provide")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 5541960ad0252d800cede9d192fcec582855931f..f9f0610b504dfd2941102f38e20af009f46c65b7 100644 (file)
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -1418,7 +1418,7 @@ static int info_bdq_free(struct dquot *dquot, qsize_t space)
        return QUOTA_NL_NOWARN;
 }
 
-static int dquot_active(const struct inode *inode)
+static int inode_quota_active(const struct inode *inode)
 {
        struct super_block *sb = inode->i_sb;
 
@@ -1441,7 +1441,7 @@ static int __dquot_initialize(struct inode *inode, int type)
        qsize_t rsv;
        int ret = 0;
 
-       if (!dquot_active(inode))
+       if (!inode_quota_active(inode))
                return 0;
 
        dquots = i_dquot(inode);
@@ -1549,7 +1549,7 @@ bool dquot_initialize_needed(struct inode *inode)
        struct dquot **dquots;
        int i;
 
-       if (!dquot_active(inode))
+       if (!inode_quota_active(inode))
                return false;
 
        dquots = i_dquot(inode);
@@ -1660,7 +1660,7 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)
        int reserve = flags & DQUOT_SPACE_RESERVE;
        struct dquot **dquots;
 
-       if (!dquot_active(inode)) {
+       if (!inode_quota_active(inode)) {
                if (reserve) {
                        spin_lock(&inode->i_lock);
                        *inode_reserved_space(inode) += number;
@@ -1730,7 +1730,7 @@ int dquot_alloc_inode(struct inode *inode)
        struct dquot_warn warn[MAXQUOTAS];
        struct dquot * const *dquots;
 
-       if (!dquot_active(inode))
+       if (!inode_quota_active(inode))
                return 0;
        for (cnt = 0; cnt < MAXQUOTAS; cnt++)
                warn[cnt].w_type = QUOTA_NL_NOWARN;
@@ -1773,7 +1773,7 @@ int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
        struct dquot **dquots;
        int cnt, index;
 
-       if (!dquot_active(inode)) {
+       if (!inode_quota_active(inode)) {
                spin_lock(&inode->i_lock);
                *inode_reserved_space(inode) -= number;
                __inode_add_bytes(inode, number);
@@ -1815,7 +1815,7 @@ void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number)
        struct dquot **dquots;
        int cnt, index;
 
-       if (!dquot_active(inode)) {
+       if (!inode_quota_active(inode)) {
                spin_lock(&inode->i_lock);
                *inode_reserved_space(inode) += number;
                __inode_sub_bytes(inode, number);
@@ -1859,7 +1859,7 @@ void __dquot_free_space(struct inode *inode, qsize_t number, int flags)
        struct dquot **dquots;
        int reserve = flags & DQUOT_SPACE_RESERVE, index;
 
-       if (!dquot_active(inode)) {
+       if (!inode_quota_active(inode)) {
                if (reserve) {
                        spin_lock(&inode->i_lock);
                        *inode_reserved_space(inode) -= number;
@@ -1914,7 +1914,7 @@ void dquot_free_inode(struct inode *inode)
        struct dquot * const *dquots;
        int index;
 
-       if (!dquot_active(inode))
+       if (!inode_quota_active(inode))
                return;
 
        dquots = i_dquot(inode);
@@ -2086,7 +2086,7 @@ int dquot_transfer(struct user_namespace *mnt_userns, struct inode *inode,
        struct super_block *sb = inode->i_sb;
        int ret;
 
-       if (!dquot_active(inode))
+       if (!inode_quota_active(inode))
                return 0;
 
        if (i_uid_needs_update(mnt_userns, iattr, inode)) {