All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Chris Mason <clm@fb.com>, Josef Bacik <josef@toxicpanda.com>,
	David Sterba <dsterba@suse.com>
Cc: linux-btrfs@vger.kernel.org
Subject: [PATCH 06/20] btrfs: remove the mirror_num argument to btrfs_submit_compressed_read
Date: Thu,  9 Mar 2023 10:05:12 +0100	[thread overview]
Message-ID: <20230309090526.332550-7-hch@lst.de> (raw)
In-Reply-To: <20230309090526.332550-1-hch@lst.de>

Given that read recovery for data I/O is handled in the storage layer,
the mirror_num argument to btrfs_submit_compressed_read is always 0,
so remove it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/btrfs/compression.c | 4 ++--
 fs/btrfs/compression.h | 2 +-
 fs/btrfs/extent_io.c   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index c5839d04690d67..cc6bc0c13bbe12 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -499,7 +499,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,
  * After the compressed pages are read, we copy the bytes into the
  * bio we were passed and then call the bio end_io calls
  */
-void btrfs_submit_compressed_read(struct btrfs_bio *bbio, int mirror_num)
+void btrfs_submit_compressed_read(struct btrfs_bio *bbio)
 {
 	struct btrfs_inode *inode = bbio->inode;
 	struct btrfs_fs_info *fs_info = inode->root->fs_info;
@@ -566,7 +566,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio, int mirror_num)
 	if (memstall)
 		psi_memstall_leave(&pflags);
 
-	btrfs_submit_bio(&cb->bbio, mirror_num);
+	btrfs_submit_bio(&cb->bbio, 0);
 	return;
 
 out_free_compressed_pages:
diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h
index 5d5146e72a860b..8ba8e62b096061 100644
--- a/fs/btrfs/compression.h
+++ b/fs/btrfs/compression.h
@@ -94,7 +94,7 @@ void btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start,
 				  blk_opf_t write_flags,
 				  struct cgroup_subsys_state *blkcg_css,
 				  bool writeback);
-void btrfs_submit_compressed_read(struct btrfs_bio *bbio, int mirror_num);
+void btrfs_submit_compressed_read(struct btrfs_bio *bbio);
 
 unsigned int btrfs_compress_str2level(unsigned int type, const char *str);
 
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 5169e73ffea647..d60a80572b8ba2 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -126,7 +126,7 @@ static void submit_one_bio(struct btrfs_bio_ctrl *bio_ctrl)
 
 	if (btrfs_op(&bbio->bio) == BTRFS_MAP_READ &&
 	    bio_ctrl->compress_type != BTRFS_COMPRESS_NONE)
-		btrfs_submit_compressed_read(bbio, 0);
+		btrfs_submit_compressed_read(bbio);
 	else
 		btrfs_submit_bio(bbio, 0);
 
-- 
2.39.2


  parent reply	other threads:[~2023-03-09  9:07 UTC|newest]

Thread overview: 74+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-09  9:05 simplify extent_buffer reading and writing Christoph Hellwig
2023-03-09  9:05 ` [PATCH 01/20] btrfs: mark extent_buffer_under_io static Christoph Hellwig
2023-03-09 11:06   ` Johannes Thumshirn
2023-03-10  7:26   ` Qu Wenruo
2023-03-09  9:05 ` [PATCH 02/20] btrfs: move setting the buffer uptodate out of validate_extent_buffer Christoph Hellwig
2023-03-09 11:10   ` Johannes Thumshirn
2023-03-10  7:27   ` Qu Wenruo
2023-03-09  9:05 ` [PATCH 03/20] btrfs: merge verify_parent_transid and btrfs_buffer_uptodate Christoph Hellwig
2023-03-09 11:17   ` Johannes Thumshirn
2023-03-09 15:21     ` Christoph Hellwig
2023-03-10  7:28   ` Qu Wenruo
2023-03-09  9:05 ` [PATCH 04/20] btrfs: always read the entire extent_buffer Christoph Hellwig
2023-03-09 11:29   ` Johannes Thumshirn
2023-03-09 15:21     ` Christoph Hellwig
2023-03-14  6:09     ` Christoph Hellwig
2023-03-17 23:16     ` David Sterba
2023-03-20  5:46       ` Christoph Hellwig
2023-03-10  7:35   ` Qu Wenruo
2023-03-09  9:05 ` [PATCH 05/20] btrfs: simplify extent buffer reading Christoph Hellwig
2023-03-09 11:59   ` Johannes Thumshirn
2023-03-10  7:42   ` Qu Wenruo
2023-03-10  7:47     ` Christoph Hellwig
2023-03-10  8:02       ` Qu Wenruo
2023-03-10  8:03         ` Christoph Hellwig
2023-03-10  8:07           ` Qu Wenruo
2023-03-10  8:15             ` Christoph Hellwig
2023-03-10  9:14               ` Qu Wenruo
2023-03-10 10:54       ` Filipe Manana
2023-03-10 11:12         ` Qu Wenruo
2023-03-09  9:05 ` Christoph Hellwig [this message]
2023-03-09 12:58   ` [PATCH 06/20] btrfs: remove the mirror_num argument to btrfs_submit_compressed_read Johannes Thumshirn
2023-03-09  9:05 ` [PATCH 07/20] btrfs: simplify the read_extent_buffer end_io handler Christoph Hellwig
2023-03-09 13:08   ` Johannes Thumshirn
2023-03-10  8:14   ` Qu Wenruo
2023-03-10  8:17     ` Christoph Hellwig
2023-03-10  8:30       ` Qu Wenruo
2023-03-10  9:30   ` Qu Wenruo
2023-03-09  9:05 ` [PATCH 08/20] btrfs: do not try to unlock the extent for non-subpage metadata reads Christoph Hellwig
2023-03-09 13:13   ` Johannes Thumshirn
2023-03-09  9:05 ` [PATCH 09/20] btrfs: return bool from lock_extent_buffer_for_io Christoph Hellwig
2023-03-09 13:17   ` Johannes Thumshirn
2023-03-09  9:05 ` [PATCH 10/20] btrfs: submit a writeback bio per extent_buffer Christoph Hellwig
2023-03-09 13:35   ` Johannes Thumshirn
2023-03-09  9:05 ` [PATCH 11/20] btrfs: move page locking from lock_extent_buffer_for_io to write_one_eb Christoph Hellwig
2023-03-09 13:46   ` Johannes Thumshirn
2023-03-09  9:05 ` [PATCH 12/20] btrfs: simplify extent buffer writing Christoph Hellwig
2023-03-09 14:00   ` Johannes Thumshirn
2023-03-09 15:22     ` Christoph Hellwig
2023-03-10  8:34   ` Qu Wenruo
2023-03-10  8:41     ` Christoph Hellwig
2023-03-09  9:05 ` [PATCH 13/20] btrfs: simplify the extent_buffer write end_io handler Christoph Hellwig
2023-03-09 14:10   ` Johannes Thumshirn
2023-03-09 15:22     ` Christoph Hellwig
2023-03-10  8:44   ` Qu Wenruo
2023-03-10 11:47     ` Christoph Hellwig
2023-03-09  9:05 ` [PATCH 14/20] btrfs: simplify btree block checksumming Christoph Hellwig
2023-03-09 15:51   ` Johannes Thumshirn
2023-03-10  8:57   ` Qu Wenruo
2023-03-09  9:05 ` [PATCH 15/20] btrfs: remove the io_pages field in struct extent_buffer Christoph Hellwig
2023-03-09 16:01   ` Johannes Thumshirn
2023-03-10  8:53   ` Qu Wenruo
2023-03-10 11:50     ` Christoph Hellwig
2023-03-09  9:05 ` [PATCH 16/20] btrfs: stop using PageError for extent_buffers Christoph Hellwig
2023-03-09 16:05   ` Johannes Thumshirn
2023-03-09  9:05 ` [PATCH 17/20] btrfs: don't check for uptodate pages in read_extent_buffer_pages Christoph Hellwig
2023-03-09 16:10   ` Johannes Thumshirn
2023-03-10  9:08   ` Qu Wenruo
2023-03-10 11:54     ` Christoph Hellwig
2023-03-14  6:12     ` Christoph Hellwig
2023-03-09  9:05 ` [PATCH 18/20] btrfs: stop using lock_extent in btrfs_buffer_uptodate Christoph Hellwig
2023-03-09  9:05 ` [PATCH 19/20] btrfs: use per-buffer locking for extent_buffer reading Christoph Hellwig
2023-03-09 17:12   ` Johannes Thumshirn
2023-03-09  9:05 ` [PATCH 20/20] btrfs: merge write_one_subpage_eb into write_one_eb Christoph Hellwig
2023-03-09 17:28   ` Johannes Thumshirn

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=20230309090526.332550-7-hch@lst.de \
    --to=hch@lst.de \
    --cc=clm@fb.com \
    --cc=dsterba@suse.com \
    --cc=josef@toxicpanda.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.