提交 73218f6c 编写于 作者: B Baokun Li 提交者: openeuler-sync-bot

quota: rename dquot_active() to inode_quota_active()

maillist inclusion
category: bugfix
bugzilla: 188812,https://gitee.com/openeuler/kernel/issues/I7E0YR

Reference: https://www.spinics.net/lists/kernel/msg4844759.html

----------------------------------------

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: NBaokun Li <libaokun1@huawei.com>
(cherry picked from commit 329a1eb4)
上级 347d528b
...@@ -1420,7 +1420,7 @@ static int info_bdq_free(struct dquot *dquot, qsize_t space) ...@@ -1420,7 +1420,7 @@ static int info_bdq_free(struct dquot *dquot, qsize_t space)
return QUOTA_NL_NOWARN; 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; struct super_block *sb = inode->i_sb;
...@@ -1443,7 +1443,7 @@ static int __dquot_initialize(struct inode *inode, int type) ...@@ -1443,7 +1443,7 @@ static int __dquot_initialize(struct inode *inode, int type)
qsize_t rsv; qsize_t rsv;
int ret = 0; int ret = 0;
if (!dquot_active(inode)) if (!inode_quota_active(inode))
return 0; return 0;
dquots = i_dquot(inode); dquots = i_dquot(inode);
...@@ -1551,7 +1551,7 @@ bool dquot_initialize_needed(struct inode *inode) ...@@ -1551,7 +1551,7 @@ bool dquot_initialize_needed(struct inode *inode)
struct dquot **dquots; struct dquot **dquots;
int i; int i;
if (!dquot_active(inode)) if (!inode_quota_active(inode))
return false; return false;
dquots = i_dquot(inode); dquots = i_dquot(inode);
...@@ -1662,7 +1662,7 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags) ...@@ -1662,7 +1662,7 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)
int reserve = flags & DQUOT_SPACE_RESERVE; int reserve = flags & DQUOT_SPACE_RESERVE;
struct dquot **dquots; struct dquot **dquots;
if (!dquot_active(inode)) { if (!inode_quota_active(inode)) {
if (reserve) { if (reserve) {
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
*inode_reserved_space(inode) += number; *inode_reserved_space(inode) += number;
...@@ -1732,7 +1732,7 @@ int dquot_alloc_inode(struct inode *inode) ...@@ -1732,7 +1732,7 @@ int dquot_alloc_inode(struct inode *inode)
struct dquot_warn warn[MAXQUOTAS]; struct dquot_warn warn[MAXQUOTAS];
struct dquot * const *dquots; struct dquot * const *dquots;
if (!dquot_active(inode)) if (!inode_quota_active(inode))
return 0; return 0;
for (cnt = 0; cnt < MAXQUOTAS; cnt++) for (cnt = 0; cnt < MAXQUOTAS; cnt++)
warn[cnt].w_type = QUOTA_NL_NOWARN; warn[cnt].w_type = QUOTA_NL_NOWARN;
...@@ -1775,7 +1775,7 @@ int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) ...@@ -1775,7 +1775,7 @@ int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
struct dquot **dquots; struct dquot **dquots;
int cnt, index; int cnt, index;
if (!dquot_active(inode)) { if (!inode_quota_active(inode)) {
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
*inode_reserved_space(inode) -= number; *inode_reserved_space(inode) -= number;
__inode_add_bytes(inode, number); __inode_add_bytes(inode, number);
...@@ -1817,7 +1817,7 @@ void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number) ...@@ -1817,7 +1817,7 @@ void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number)
struct dquot **dquots; struct dquot **dquots;
int cnt, index; int cnt, index;
if (!dquot_active(inode)) { if (!inode_quota_active(inode)) {
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
*inode_reserved_space(inode) += number; *inode_reserved_space(inode) += number;
__inode_sub_bytes(inode, number); __inode_sub_bytes(inode, number);
...@@ -1861,7 +1861,7 @@ void __dquot_free_space(struct inode *inode, qsize_t number, int flags) ...@@ -1861,7 +1861,7 @@ void __dquot_free_space(struct inode *inode, qsize_t number, int flags)
struct dquot **dquots; struct dquot **dquots;
int reserve = flags & DQUOT_SPACE_RESERVE, index; int reserve = flags & DQUOT_SPACE_RESERVE, index;
if (!dquot_active(inode)) { if (!inode_quota_active(inode)) {
if (reserve) { if (reserve) {
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
*inode_reserved_space(inode) -= number; *inode_reserved_space(inode) -= number;
...@@ -1916,7 +1916,7 @@ void dquot_free_inode(struct inode *inode) ...@@ -1916,7 +1916,7 @@ void dquot_free_inode(struct inode *inode)
struct dquot * const *dquots; struct dquot * const *dquots;
int index; int index;
if (!dquot_active(inode)) if (!inode_quota_active(inode))
return; return;
dquots = i_dquot(inode); dquots = i_dquot(inode);
...@@ -2087,7 +2087,7 @@ int dquot_transfer(struct inode *inode, struct iattr *iattr) ...@@ -2087,7 +2087,7 @@ int dquot_transfer(struct inode *inode, struct iattr *iattr)
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
int ret; int ret;
if (!dquot_active(inode)) if (!inode_quota_active(inode))
return 0; return 0;
if (iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)){ if (iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)){
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册