[PATCH 06/10] ext4: switch to using blk_next_discard_bio directly

Christoph Hellwig
2024-03-07T15:12:15Z

This fixes fatal signals getting into the way and corrupting the bio
chain and removes the need to handle synchronous errors.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/ext4/mballoc.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index e4f7cf9d89c45a..73437510bde26c 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -3840,12 +3840,16 @@ static inline int ext4_issue_discard(struct super_block *sb,
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);
+ unsigned int sshift = (sb->s_blocksize_bits - SECTOR_SHIFT);
+ sector_t sector = (sector_t)discard_block << sshift;
+ sector_t nr_sects = (sector_t)count << sshift;
+
+ while (blk_next_discard_bio(sb->s_bdev, biop, &sector,
+ &nr_sects, GFP_NOFS))
+ ;
+ return 0;
+ }
+ return sb_issue_discard(sb, discard_block, count, GFP_NOFS, 0);
}

static void ext4_free_data_in_buddy(struct super_block *sb,
--
2.39.2