From: Zhang Yi <yi.zhang@huawei.com>
To: Keith Busch <kbusch@meta.com>, <linux-ext4@vger.kernel.org>
Cc: <tytso@mit.edu>, <adilger.kernel@dilger.ca>, <jack@suse.com>,
Keith Busch <kbusch@kernel.org>
Subject: Re: [PATCH] ext4: remove unreachable discard code
Date: Sat, 9 Mar 2024 10:58:42 +0800 [thread overview]
Message-ID: <77b00f09-63d4-6e32-df8e-e83487fbb8b8@huawei.com> (raw)
In-Reply-To: <20240309000943.1400879-1-kbusch@meta.com>
On 2024/3/9 8:09, Keith Busch wrote:
> From: Keith Busch <kbusch@kernel.org>
>
> There are no more ext4_issue_discard() users that track their own bio.
> Remove the unused parameter and the dead code that handles it.
>
> Signed-off-by: Keith Busch <kbusch@kernel.org>
Hello Keith!
Wenchao Hao has already submitted the same patch.
https://lore.kernel.org/linux-ext4/20240226081731.3224470-1-haowenchao2@huawei.com/
Thanks,
Yi.
> ---
> fs/ext4/mballoc.c | 15 ++++-----------
> 1 file changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
> index e4f7cf9d89c45..6314a2b000fd8 100644
> --- a/fs/ext4/mballoc.c
> +++ b/fs/ext4/mballoc.c
> @@ -3829,8 +3829,7 @@ void ext4_mb_release(struct super_block *sb)
> }
>
> static inline int ext4_issue_discard(struct super_block *sb,
> - ext4_group_t block_group, ext4_grpblk_t cluster, int count,
> - struct bio **biop)
> + ext4_group_t block_group, ext4_grpblk_t cluster, int count)
> {
> ext4_fsblk_t discard_block;
>
> @@ -3839,13 +3838,7 @@ static inline int ext4_issue_discard(struct super_block *sb,
> count = EXT4_C2B(EXT4_SB(sb), count);
> trace_ext4_discard_blocks(sb,
> (unsigned long long) discard_block, count);
> - if (biop) {
> - return __blkdev_issue_discard(sb->s_bdev,
> - (sector_t)discard_block << (sb->s_blocksize_bits - 9),
> - (sector_t)count << (sb->s_blocksize_bits - 9),
> - GFP_NOFS, biop);
> - } else
> - return sb_issue_discard(sb, discard_block, count, GFP_NOFS, 0);
> + return sb_issue_discard(sb, discard_block, count, GFP_NOFS, 0);
> }
>
> static void ext4_free_data_in_buddy(struct super_block *sb,
> @@ -6487,7 +6480,7 @@ static void ext4_mb_clear_bb(handle_t *handle, struct inode *inode,
> } else {
> if (test_opt(sb, DISCARD)) {
> err = ext4_issue_discard(sb, block_group, bit,
> - count_clusters, NULL);
> + count_clusters);
> if (err && err != -EOPNOTSUPP)
> ext4_msg(sb, KERN_WARNING, "discard request in"
> " group:%u block:%d count:%lu failed"
> @@ -6738,7 +6731,7 @@ __acquires(bitlock)
> */
> mb_mark_used(e4b, &ex);
> ext4_unlock_group(sb, group);
> - ret = ext4_issue_discard(sb, group, start, count, NULL);
> + ret = ext4_issue_discard(sb, group, start, count);
> ext4_lock_group(sb, group);
> mb_free_blocks(NULL, e4b, start, ex.fe_len);
> return ret;
>
prev parent reply other threads:[~2024-03-09 2:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-09 0:09 [PATCH] ext4: remove unreachable discard code Keith Busch
2024-03-09 2:58 ` Zhang Yi [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=77b00f09-63d4-6e32-df8e-e83487fbb8b8@huawei.com \
--to=yi.zhang@huawei.com \
--cc=adilger.kernel@dilger.ca \
--cc=jack@suse.com \
--cc=kbusch@kernel.org \
--cc=kbusch@meta.com \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).