From: Jan Kara <jack@suse.cz>
To: Chao Yu <chao@kernel.org>
Cc: jack@suse.com, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH] quota: convert dquot_claim_space_nodirty() to return void
Date: Mon, 11 Dec 2023 13:27:42 +0100 [thread overview]
Message-ID: <20231211122742.xnubwtret5za2mc2@quack3> (raw)
In-Reply-To: <20231210025028.3262900-1-chao@kernel.org>
On Sun 10-12-23 10:50:28, Chao Yu wrote:
> dquot_claim_space_nodirty() always return zero, let's convert it
> to return void, then, its caller can get rid of handling failure
> case.
>
> Signed-off-by: Chao Yu <chao@kernel.org>
Nice. I've added the patch to my tree. Thanks!
Honza
> ---
> fs/quota/dquot.c | 6 +++---
> include/linux/quotaops.h | 15 +++++----------
> 2 files changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
> index 58b5de081b57..44ff2813ae51 100644
> --- a/fs/quota/dquot.c
> +++ b/fs/quota/dquot.c
> @@ -1787,7 +1787,7 @@ EXPORT_SYMBOL(dquot_alloc_inode);
> /*
> * Convert in-memory reserved quotas to real consumed quotas
> */
> -int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
> +void dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
> {
> struct dquot **dquots;
> int cnt, index;
> @@ -1797,7 +1797,7 @@ int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
> *inode_reserved_space(inode) -= number;
> __inode_add_bytes(inode, number);
> spin_unlock(&inode->i_lock);
> - return 0;
> + return;
> }
>
> dquots = i_dquot(inode);
> @@ -1822,7 +1822,7 @@ int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
> spin_unlock(&inode->i_lock);
> mark_all_dquot_dirty(dquots);
> srcu_read_unlock(&dquot_srcu, index);
> - return 0;
> + return;
> }
> EXPORT_SYMBOL(dquot_claim_space_nodirty);
>
> diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
> index 4fa4ef0a173a..06cc8888199e 100644
> --- a/include/linux/quotaops.h
> +++ b/include/linux/quotaops.h
> @@ -74,7 +74,7 @@ void __dquot_free_space(struct inode *inode, qsize_t number, int flags);
>
> int dquot_alloc_inode(struct inode *inode);
>
> -int dquot_claim_space_nodirty(struct inode *inode, qsize_t number);
> +void dquot_claim_space_nodirty(struct inode *inode, qsize_t number);
> void dquot_free_inode(struct inode *inode);
> void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number);
>
> @@ -257,10 +257,9 @@ static inline void __dquot_free_space(struct inode *inode, qsize_t number,
> inode_sub_bytes(inode, number);
> }
>
> -static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
> +static inline void dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
> {
> inode_add_bytes(inode, number);
> - return 0;
> }
>
> static inline int dquot_reclaim_space_nodirty(struct inode *inode,
> @@ -358,14 +357,10 @@ static inline int dquot_reserve_block(struct inode *inode, qsize_t nr)
> DQUOT_SPACE_WARN|DQUOT_SPACE_RESERVE);
> }
>
> -static inline int dquot_claim_block(struct inode *inode, qsize_t nr)
> +static inline void dquot_claim_block(struct inode *inode, qsize_t nr)
> {
> - int ret;
> -
> - ret = dquot_claim_space_nodirty(inode, nr << inode->i_blkbits);
> - if (!ret)
> - mark_inode_dirty_sync(inode);
> - return ret;
> + dquot_claim_space_nodirty(inode, nr << inode->i_blkbits);
> + mark_inode_dirty_sync(inode);
> }
>
> static inline void dquot_reclaim_block(struct inode *inode, qsize_t nr)
> --
> 2.40.1
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
prev parent reply other threads:[~2023-12-11 12:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-10 2:50 [PATCH] quota: convert dquot_claim_space_nodirty() to return void Chao Yu
2023-12-11 12:27 ` Jan Kara [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231211122742.xnubwtret5za2mc2@quack3 \
--to=jack@suse.cz \
--cc=chao@kernel.org \
--cc=jack@suse.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).