From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
To: linux-btrfs@vger.kernel.org
Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: [PATCH 2/2] btrfs-progs: remove stride length from on-disk format
Date: Thu, 05 Oct 2023 23:58:03 -0700 [thread overview]
Message-ID: <20231005-rst-update-v1-2-7ea5b3c6ac61@wdc.com> (raw)
In-Reply-To: <20231005-rst-update-v1-0-7ea5b3c6ac61@wdc.com>
Fixes: 0e6b800eb9d6 ("btrfs-progs: add raid stripe tree definitions")
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
kernel-shared/accessors.h | 8 --------
kernel-shared/uapi/btrfs_tree.h | 2 --
2 files changed, 10 deletions(-)
diff --git a/kernel-shared/accessors.h b/kernel-shared/accessors.h
index 688edf9e909f..bc613a55ba73 100644
--- a/kernel-shared/accessors.h
+++ b/kernel-shared/accessors.h
@@ -282,7 +282,6 @@ BTRFS_SETGET_FUNCS(free_space_flags, struct btrfs_free_space_info, flags, 32);
BTRFS_SETGET_FUNCS(stripe_extent_encoding, struct btrfs_stripe_extent, encoding, 8);
BTRFS_SETGET_FUNCS(raid_stride_devid, struct btrfs_raid_stride, devid, 64);
BTRFS_SETGET_FUNCS(raid_stride_offset, struct btrfs_raid_stride, offset, 64);
-BTRFS_SETGET_FUNCS(raid_stride_length, struct btrfs_raid_stride, length, 64);
static inline struct btrfs_raid_stride *btrfs_raid_stride_nr(
struct btrfs_stripe_extent *dps,
@@ -309,13 +308,6 @@ static inline u64 btrfs_raid_stride_offset_nr(struct extent_buffer *eb,
return btrfs_raid_stride_offset(eb, btrfs_raid_stride_nr(dps, nr));
}
-static inline u64 btrfs_raid_stride_length_nr(struct extent_buffer *eb,
- struct btrfs_stripe_extent *dps,
- int nr)
-{
- return btrfs_raid_stride_length(eb, btrfs_raid_stride_nr(dps, nr));
-}
-
/* struct btrfs_inode_ref */
BTRFS_SETGET_FUNCS(inode_ref_name_len, struct btrfs_inode_ref, name_len, 16);
BTRFS_SETGET_FUNCS(inode_ref_index, struct btrfs_inode_ref, index, 64);
diff --git a/kernel-shared/uapi/btrfs_tree.h b/kernel-shared/uapi/btrfs_tree.h
index 8d8898b93c07..32f2c2d7c29f 100644
--- a/kernel-shared/uapi/btrfs_tree.h
+++ b/kernel-shared/uapi/btrfs_tree.h
@@ -707,8 +707,6 @@ struct btrfs_raid_stride {
__le64 devid;
/* offset from the devextent start */
__le64 offset;
- /* length of the stride on disk */
- __le64 length;
} __attribute__ ((__packed__));
/* The stripe_extent::encoding, 1:1 mapping of enum btrfs_raid_types */
--
2.41.0
next prev parent reply other threads:[~2023-10-06 6:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-06 6:58 [PATCH 0/2] btrfs-progs: update on-disk format for raid-stripe-tree Johannes Thumshirn
2023-10-06 6:58 ` [PATCH 1/2] btrfs-progs: remove stride length from tree dump Johannes Thumshirn
2023-10-06 6:58 ` Johannes Thumshirn [this message]
2023-10-06 15:27 ` [PATCH 0/2] btrfs-progs: update on-disk format for raid-stripe-tree David Sterba
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=20231005-rst-update-v1-2-7ea5b3c6ac61@wdc.com \
--to=johannes.thumshirn@wdc.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).