From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>,
Chandan Babu R <chandanbabu@kernel.org>,
Keith Busch <kbusch@kernel.org>
Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
linux-xfs@vger.kernel.org
Subject: [PATCH 05/10] f2fs: switch to using blk_next_discard_bio directly
Date: Thu, 7 Mar 2024 08:11:52 -0700 [thread overview]
Message-ID: <20240307151157.466013-6-hch@lst.de> (raw)
In-Reply-To: <20240307151157.466013-1-hch@lst.de>
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/f2fs/segment.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index e1065ba7020761..c131e138d74f94 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1305,10 +1305,12 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
if (time_to_inject(sbi, FAULT_DISCARD)) {
err = -EIO;
} else {
- err = __blkdev_issue_discard(bdev,
- SECTOR_FROM_BLOCK(start),
- SECTOR_FROM_BLOCK(len),
- GFP_NOFS, &bio);
+ sector_t sector = SECTOR_FROM_BLOCK(start);
+ sector_t nr_sects = SECTOR_FROM_BLOCK(len);
+
+ while (blk_next_discard_bio(bdev, &bio, §or,
+ &nr_sects, GFP_NOFS))
+ ;
}
if (err) {
spin_lock_irqsave(&dc->lock, flags);
--
2.39.2
next prev parent reply other threads:[~2024-03-07 15:12 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-07 15:11 RFC: untangle and fix __blkdev_issue_discard Christoph Hellwig
2024-03-07 15:11 ` [PATCH 01/10] block: remove the discard_granularity check in __blkdev_issue_discard Christoph Hellwig
2024-03-07 15:11 ` [PATCH 02/10] block: move discard checks into the ioctl handler Christoph Hellwig
2024-03-07 21:33 ` Dave Chinner
2024-03-08 15:22 ` Christoph Hellwig
2024-03-08 21:16 ` Dave Chinner
2024-03-07 15:11 ` [PATCH 03/10] block: add a blk_next_discard_bio helper Christoph Hellwig
2024-03-07 15:11 ` [PATCH 04/10] xfs: switch to using blk_next_discard_bio directly Christoph Hellwig
2024-03-07 15:11 ` Christoph Hellwig [this message]
2024-03-07 15:11 ` [PATCH 06/10] ext4: " Christoph Hellwig
2024-03-07 16:13 ` Keith Busch
2024-03-08 15:21 ` Christoph Hellwig
2024-03-07 15:11 ` [PATCH 07/10] nvmet: " Christoph Hellwig
2024-03-07 15:11 ` [PATCH 08/10] md: " Christoph Hellwig
2024-03-07 15:11 ` [PATCH 09/10] dm-thin: " Christoph Hellwig
2024-03-07 15:11 ` [PATCH 10/10] block: remove __blkdev_issue_discard Christoph Hellwig
2024-03-07 21:05 ` RFC: untangle and fix __blkdev_issue_discard Keith Busch
2024-03-08 15:21 ` Christoph Hellwig
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=20240307151157.466013-6-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=chandanbabu@kernel.org \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-xfs@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