public inbox for linux-block@vger.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>, Chris Mason <clm@fb.com>,
	Josef Bacik <josef@toxicpanda.com>,
	David Sterba <dsterba@suse.com>,
	Damien Le Moal <damien.lemoal@wdc.com>
Cc: linux-block@vger.kernel.org, linux-btrfs@vger.kernel.org,
	Damien Le Moal <dlemoal@kernel.org>
Subject: [PATCH 4/5] btrfs: use bio_is_zone_append in the completion handler
Date: Mon,  4 Nov 2024 07:26:32 +0100	[thread overview]
Message-ID: <20241104062647.91160-5-hch@lst.de> (raw)
In-Reply-To: <20241104062647.91160-1-hch@lst.de>

Otherwise it won't catch bios turned into regular writes by the
block level zone write plugging.

Fixes: 9b1ce7f0c6f8 ("block: Implement zone append emulation")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
---
 fs/btrfs/bio.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/bio.c b/fs/btrfs/bio.c
index fec5c6cde0a7..0f096e226908 100644
--- a/fs/btrfs/bio.c
+++ b/fs/btrfs/bio.c
@@ -366,7 +366,7 @@ static void btrfs_simple_end_io(struct bio *bio)
 		INIT_WORK(&bbio->end_io_work, btrfs_end_bio_work);
 		queue_work(btrfs_end_io_wq(fs_info, bio), &bbio->end_io_work);
 	} else {
-		if (bio_op(bio) == REQ_OP_ZONE_APPEND && !bio->bi_status)
+		if (bio_is_zone_append(bio) && !bio->bi_status)
 			btrfs_record_physical_zoned(bbio);
 		btrfs_bio_end_io(bbio, bbio->bio.bi_status);
 	}
@@ -409,7 +409,7 @@ static void btrfs_orig_write_end_io(struct bio *bio)
 	else
 		bio->bi_status = BLK_STS_OK;
 
-	if (bio_op(bio) == REQ_OP_ZONE_APPEND && !bio->bi_status)
+	if (bio_is_zone_append(bio) && !bio->bi_status)
 		stripe->physical = bio->bi_iter.bi_sector << SECTOR_SHIFT;
 
 	btrfs_bio_end_io(bbio, bbio->bio.bi_status);
@@ -423,7 +423,7 @@ static void btrfs_clone_write_end_io(struct bio *bio)
 	if (bio->bi_status) {
 		atomic_inc(&stripe->bioc->error);
 		btrfs_log_dev_io_error(bio, stripe->dev);
-	} else if (bio_op(bio) == REQ_OP_ZONE_APPEND) {
+	} else if (bio_is_zone_append(bio)) {
 		stripe->physical = bio->bi_iter.bi_sector << SECTOR_SHIFT;
 	}
 
-- 
2.45.2


  parent reply	other threads:[~2024-11-04  6:27 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-04  6:26 fix a few zoned append issues v2 (now with Ccs) Christoph Hellwig
2024-11-04  6:26 ` [PATCH 1/5] block: take chunk_sectors into account in bio_split_write_zeroes Christoph Hellwig
2024-11-07 12:04   ` Damien Le Moal
2024-11-11 16:08   ` (subset) " Jens Axboe
2024-11-04  6:26 ` [PATCH 2/5] block: fix bio_split_rw_at to take zone_write_granularity into account Christoph Hellwig
2024-11-07 12:05   ` Damien Le Moal
2024-11-08  7:07   ` Johannes Thumshirn
2024-11-04  6:26 ` [PATCH 3/5] block: lift bio_is_zone_append to bio.h Christoph Hellwig
2024-11-08  7:08   ` Johannes Thumshirn
2024-11-04  6:26 ` Christoph Hellwig [this message]
2024-11-08  7:08   ` [PATCH 4/5] btrfs: use bio_is_zone_append in the completion handler Johannes Thumshirn
2024-11-04  6:26 ` [PATCH 5/5] btrfs: split bios to the fs sector size boundary Christoph Hellwig
2024-11-08  7:09   ` Johannes Thumshirn
2024-11-08 14:48 ` fix a few zoned append issues v2 (now with Ccs) Christoph Hellwig
2024-11-08 15:03   ` David Sterba
2024-12-03 17:01   ` David Sterba
2024-12-04  0:17     ` Christoph Hellwig
2024-12-04  6:13       ` Qu Wenruo

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=20241104062647.91160-5-hch@lst.de \
    --to=hch@lst.de \
    --cc=axboe@kernel.dk \
    --cc=clm@fb.com \
    --cc=damien.lemoal@wdc.com \
    --cc=dlemoal@kernel.org \
    --cc=dsterba@suse.com \
    --cc=josef@toxicpanda.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-btrfs@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