Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88c0cdfe authored by Baokun Li's avatar Baokun Li Committed by Greg Kroah-Hartman
Browse files

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: default avatarBaokun Li <libaokun1@huawei.com>
Signed-off-by: default avatarJan 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: default avatarSasha Levin <sashal@kernel.org>
parent 29d7249b

fs/quota/dquot.c

+10 −10
Original line number Diff line number Diff line
@@ -1409,7 +1409,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;
@@ -1432,7 +1432,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);
@@ -1540,7 +1540,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);
@@ -1651,7 +1651,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;
@@ -1721,7 +1721,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;
@@ -1764,7 +1764,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);
@@ -1806,7 +1806,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);
@@ -1850,7 +1850,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;
@@ -1905,7 +1905,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);
@@ -2076,7 +2076,7 @@ int dquot_transfer(struct inode *inode, struct iattr *iattr) 
	struct super_block *sb = inode->i_sb;

	int ret;



	if (!dquot_active(inode))

	if (!inode_quota_active(inode))

		return 0;



	if (iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)){