From: Johannes Thumshirn <jth@kernel.org>
To: Chris Mason <clm@fb.com>, Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>
Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org,
Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: [PATCH v2 1/6] btrfs: pass reloc_control to relocate_data_extent
Date: Thu, 06 Jun 2024 10:34:59 +0200 [thread overview]
Message-ID: <20240606-reloc-cleanups-v2-1-5172a6926f62@kernel.org> (raw)
In-Reply-To: <20240606-reloc-cleanups-v2-0-5172a6926f62@kernel.org>
From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Pass a 'struct reloc_control' to relocate_data_extent() instead of
it's data_inode and file_extent_cluster separately.
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
---
fs/btrfs/relocation.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 81836a38325a..442d3c074477 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -3123,10 +3123,11 @@ static int relocate_file_extent_cluster(struct inode *inode,
return ret;
}
-static noinline_for_stack int relocate_data_extent(struct inode *inode,
- const struct btrfs_key *extent_key,
- struct file_extent_cluster *cluster)
+static noinline_for_stack int relocate_data_extent(struct reloc_control *rc,
+ const struct btrfs_key *extent_key)
{
+ struct inode *inode = rc->data_inode;
+ struct file_extent_cluster *cluster = &rc->cluster;
int ret;
struct btrfs_root *root = BTRFS_I(inode)->root;
@@ -3745,8 +3746,7 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
if (rc->stage == MOVE_DATA_EXTENTS &&
(flags & BTRFS_EXTENT_FLAG_DATA)) {
rc->found_file_extent = true;
- ret = relocate_data_extent(rc->data_inode,
- &key, &rc->cluster);
+ ret = relocate_data_extent(rc, &key);
if (ret < 0) {
err = ret;
break;
--
2.43.0
next prev parent reply other threads:[~2024-06-06 8:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-06 8:34 [PATCH v2 0/6] btrfs: small cleanups for relocation code Johannes Thumshirn
2024-06-06 8:34 ` Johannes Thumshirn [this message]
2024-06-06 8:35 ` [PATCH v2 2/6] btrfs: pass a reloc_control to relocate_file_extent_cluster Johannes Thumshirn
2024-06-06 8:35 ` [PATCH v2 3/6] btrfs: pass a reloc_control to relocate_one_folio Johannes Thumshirn
2024-06-06 8:35 ` [PATCH v2 4/6] btrfs: don't pass fs_info to describe_relocation Johannes Thumshirn
2024-06-06 8:35 ` [PATCH v2 5/6] btrfs: pass a struct reloc_control to prealloc_file_extent_cluster Johannes Thumshirn
2024-06-06 16:54 ` Josef Bacik
2024-06-06 8:35 ` [PATCH v2 6/6] btrfs: pass reloc_control to setup_relocation_extent_mapping Johannes Thumshirn
2024-06-06 16:55 ` Josef Bacik
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=20240606-reloc-cleanups-v2-1-5172a6926f62@kernel.org \
--to=jth@kernel.org \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=johannes.thumshirn@wdc.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@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