diff options
| author | Xiao Ni <xni@redhat.com> | 2025-03-06 17:49:38 +0800 |
|---|---|---|
| committer | Yu Kuai <yukuai@kernel.org> | 2025-03-06 22:34:20 +0800 |
| commit | 3db4404435397a345431b45f57876a3df133f3b4 (patch) | |
| tree | fdad7087d370da04fe46ccd5813278e8b5b57e68 | |
| parent | 6130825f34d41718c98a9b1504a79a23e379701e (diff) | |
md/raid10: wait barrier before returning discard request with REQ_NOWAIT
raid10_handle_discard should wait barrier before returning a discard bio
which has REQ_NOWAIT. And there is no need to print warning calltrace
if a discard bio has REQ_NOWAIT flag. Quality engineer usually checks
dmesg and reports error if dmesg has warning/error calltrace.
Fixes: c9aa889b035f ("md: raid10 add nowait support")
Signed-off-by: Xiao Ni <xni@redhat.com>
Acked-by: Coly Li <colyli@kernel.org>
Link: https://lore.kernel.org/linux-raid/20250306094938.48952-1-xni@redhat.com
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
| -rw-r--r-- | drivers/md/raid10.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 1c2026682f86..9d8516acf2fd 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -1624,11 +1624,10 @@ static int raid10_handle_discard(struct mddev *mddev, struct bio *bio) if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)) return -EAGAIN; - if (WARN_ON_ONCE(bio->bi_opf & REQ_NOWAIT)) { + if (!wait_barrier(conf, bio->bi_opf & REQ_NOWAIT)) { bio_wouldblock_error(bio); return 0; } - wait_barrier(conf, false); /* * Check reshape again to avoid reshape happens after checking |