Skip to content

Commit

Permalink
quota: rename dquot_active() to inode_quota_active()
Browse files Browse the repository at this point in the history
[ Upstream commit 4b9bdfa ]

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: dabc8b2 ("quota: fix dqput() to follow the guarantees dquot_srcu should provide")
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Baokun Li authored and gregkh committed Sep 13, 2023
1 parent 622789e commit fdcc50d
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions fs/quota/dquot.c
Expand Up @@ -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;

Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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)) {
Expand Down

0 comments on commit fdcc50d

Please sign in to comment.