[PATCH 3/4] btrfs: rename ordered_enmtry in btrfs_io_context

Johannes Thumshirn
2023-09-18T15:48:24Z

Rename the 'ordered_entry' member of 'struct btrfs_io_context' to
'rst_ordered_entry' to make it clear, it is only there for updates to the
raid-stripe-tree.

Cc: Qu Wenru <wqu@suse.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
fs/btrfs/bio.c | 3 ++-
fs/btrfs/raid-stripe-tree.c | 18 +++++++++---------
fs/btrfs/volumes.h | 2 +-
3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/fs/btrfs/bio.c b/fs/btrfs/bio.c
index 4c234024beae..d0a029c859e1 100644
--- a/fs/btrfs/bio.c
+++ b/fs/btrfs/bio.c
@@ -708,7 +708,8 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
* can't happen until after the last submission.
*/
btrfs_get_bioc(bioc);
- list_add_tail(&bioc->ordered_entry, &bbio->ordered->bioc_list);
+ list_add_tail(&bioc->rst_ordered_entry,
+ &bbio->ordered->bioc_list);
}

/*
diff --git a/fs/btrfs/raid-stripe-tree.c b/fs/btrfs/raid-stripe-tree.c
index 0c0e620ed8b9..1bf84258dbfa 100644
--- a/fs/btrfs/raid-stripe-tree.c
+++ b/fs/btrfs/raid-stripe-tree.c
@@ -132,7 +132,7 @@ static int btrfs_insert_mirrored_raid_extents(struct btrfs_trans_handle *trans,
struct btrfs_io_context *bioc;
int ret;

- list_for_each_entry(bioc, &ordered->bioc_list, ordered_entry) {
+ list_for_each_entry(bioc, &ordered->bioc_list, rst_ordered_entry) {
ret = btrfs_insert_one_raid_extent(trans, num_stripes, bioc);
if (ret)
return ret;
@@ -167,12 +167,12 @@ static int btrfs_insert_striped_mirrored_raid_extents(

rbioc->map_type = map_type;
rbioc->logical = list_first_entry(&ordered->bioc_list, typeof(*rbioc),
- ordered_entry)->logical;
+ rst_ordered_entry)->logical;

stripe_end = rbioc->logical;
prev_end = stripe_end;
i = 0;
- list_for_each_entry(bioc, &ordered->bioc_list, ordered_entry) {
+ list_for_each_entry(bioc, &ordered->bioc_list, rst_ordered_entry) {
rbioc->size += bioc->size;
for (int j = 0; j < substripes; j++) {
int stripe = i + j;
@@ -201,7 +201,7 @@ static int btrfs_insert_striped_mirrored_raid_extents(
}

if (left) {
- bioc = list_prev_entry(bioc, ordered_entry);
+ bioc = list_prev_entry(bioc, rst_ordered_entry);
ret = btrfs_insert_one_raid_extent(trans, substripes, bioc);
}

@@ -225,10 +225,10 @@ static int btrfs_insert_striped_raid_extents(struct btrfs_trans_handle *trans,
return -ENOMEM;
rbioc->map_type = map_type;
rbioc->logical = list_first_entry(&ordered->bioc_list, typeof(*rbioc),
- ordered_entry)->logical;
+ rst_ordered_entry)->logical;

i = 0;
- list_for_each_entry(bioc, &ordered->bioc_list, ordered_entry) {
+ list_for_each_entry(bioc, &ordered->bioc_list, rst_ordered_entry) {
rbioc->size += bioc->size;
rbioc->stripes[i].dev = bioc->stripes[0].dev;
rbioc->stripes[i].physical = bioc->stripes[0].physical;
@@ -266,7 +266,7 @@ int btrfs_insert_raid_extent(struct btrfs_trans_handle *trans,
return 0;

map_type = list_first_entry(&ordered_extent->bioc_list, typeof(*bioc),
- ordered_entry)->map_type;
+ rst_ordered_entry)->map_type;

switch (map_type & BTRFS_BLOCK_GROUP_PROFILE_MASK) {
case BTRFS_BLOCK_GROUP_DUP:
@@ -291,8 +291,8 @@ int btrfs_insert_raid_extent(struct btrfs_trans_handle *trans,

while (!list_empty(&ordered_extent->bioc_list)) {
bioc = list_first_entry(&ordered_extent->bioc_list,
- typeof(*bioc), ordered_entry);
- list_del(&bioc->ordered_entry);
+ typeof(*bioc), rst_ordered_entry);
+ list_del(&bioc->rst_ordered_entry);
btrfs_put_bioc(bioc);
}

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 54549e34a306..b511d17c6717 100644
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -432,7 +432,7 @@ struct btrfs_io_context {

u64 logical;
u64 size;
- struct list_head ordered_entry;
+ struct list_head rst_ordered_entry;

/*
* The total number of stripes, including the extra duplicated

--
2.41.0