From: Johannes Thumshirn <jth@kernel.org>
To: Chris Mason <clm@fb.com>, Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>
Cc: Filipe Manana <fdmanana@suse.com>,
linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org,
Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: [PATCH v3 06/14] btrfs: fix deletion of a range spanning parts two RAID stripe extents
Date: Thu, 09 Jan 2025 16:15:07 +0100 [thread overview]
Message-ID: <20250109-rst-delete-fixes-v3-6-b5c73a4b2a80@kernel.org> (raw)
In-Reply-To: <20250109-rst-delete-fixes-v3-0-b5c73a4b2a80@kernel.org>
From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
When a user requests the deletion of a range that spans multiple stripe
extents and btrfs_search_slot() returns us the second RAID stripe extent,
we need to pick the previous item and truncate it, if there's still a
range to delete left, move on to the next item.
The following diagram illustrates the operation:
|--- RAID Stripe Extent ---||--- RAID Stripe Extent ---|
|--- keep ---|--- drop ---|
While at it, comment the trivial case of a whole item delete as well.
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
fs/btrfs/raid-stripe-tree.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/fs/btrfs/raid-stripe-tree.c b/fs/btrfs/raid-stripe-tree.c
index ef76202c3a38460c5a36d7309ac0a616f73b0cc0..7ddc139ae1cf2d4844b1955ed3ecfe1b91f40049 100644
--- a/fs/btrfs/raid-stripe-tree.c
+++ b/fs/btrfs/raid-stripe-tree.c
@@ -99,6 +99,31 @@ int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start, u64 le
found_end = found_start + key.offset;
ret = 0;
+ /*
+ * The stripe extent starts before the range we want to delete,
+ * but the range spans more than one stripe extent:
+ *
+ * |--- RAID Stripe Extent ---||--- RAID Stripe Extent ---|
+ * |--- keep ---|--- drop ---|
+ *
+ * This means we have to get the previous item, truncate its
+ * length and then restart the search.
+ */
+ if (found_start > start) {
+
+ ret = btrfs_previous_item(stripe_root, path, start,
+ BTRFS_RAID_STRIPE_KEY);
+ if (ret < 0)
+ break;
+ ret = 0;
+
+ leaf = path->nodes[0];
+ slot = path->slots[0];
+ btrfs_item_key_to_cpu(leaf, &key, slot);
+ found_start = key.objectid;
+ found_end = found_start + key.offset;
+ }
+
if (key.type != BTRFS_RAID_STRIPE_KEY)
break;
@@ -152,6 +177,9 @@ int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start, u64 le
break;
}
+ /*
+ * Finally we can delete the whole item, no more special cases.
+ */
ret = btrfs_del_item(trans, stripe_root, path);
if (ret)
break;
--
2.43.0
next prev parent reply other threads:[~2025-01-09 15:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-09 15:15 [PATCH v3 00/14] btrfs: more RST delete fixes Johannes Thumshirn
2025-01-09 15:15 ` [PATCH v3 01/14] btrfs: selftests: correct RAID stripe-tree feature flag setting Johannes Thumshirn
2025-01-09 15:31 ` Johannes Thumshirn
2025-01-09 15:15 ` [PATCH v3 02/14] btrfs: don't try to delete RAID stripe-extents if we don't need to Johannes Thumshirn
2025-01-09 15:15 ` [PATCH v3 03/14] btrfs: assert RAID stripe-extent length is always greater than 0 Johannes Thumshirn
2025-01-09 15:15 ` [PATCH v3 04/14] btrfs: fix front delete range calculation for RAID stripe extents Johannes Thumshirn
2025-01-09 15:15 ` [PATCH v3 05/14] btrfs: fix tail delete of RAID stripe-extents Johannes Thumshirn
2025-01-09 15:15 ` Johannes Thumshirn [this message]
2025-01-09 15:15 ` [PATCH v3 07/14] btrfs: implement hole punching for RAID stripe extents Johannes Thumshirn
2025-01-09 15:15 ` [PATCH v3 08/14] btrfs: don't use btrfs_set_item_key_safe on RAID stripe-extents Johannes Thumshirn
2025-01-09 15:15 ` [PATCH v3 09/14] btrfs: selftests: check for correct return value of failed lookup Johannes Thumshirn
2025-01-09 15:15 ` [PATCH v3 10/14] btrfs: selftests: don't split RAID extents in half Johannes Thumshirn
2025-01-09 15:15 ` [PATCH v3 11/14] btrfs: selftests: test RAID stripe-tree deletion spanning two items Johannes Thumshirn
2025-01-09 15:15 ` [PATCH v3 12/14] btrfs: selftests: add selftest for punching holes into the RAID stripe extents Johannes Thumshirn
2025-01-09 15:15 ` [PATCH v3 13/14] btrfs: selftests: add test for punching a hole into 3 RAID stripe-extents Johannes Thumshirn
2025-01-09 15:15 ` [PATCH v3 14/14] btrfs: selftests: add a selftest for deleting two out of three extents Johannes Thumshirn
2025-01-09 15:41 ` [PATCH v3 00/14] btrfs: more RST delete fixes 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=20250109-rst-delete-fixes-v3-6-b5c73a4b2a80@kernel.org \
--to=jth@kernel.org \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=fdmanana@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
all inboxes | Powered by JetHome®