mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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,
	 Filipe Manana <fdmanana@suse.com>,
	 Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: [PATCH v2 04/14] btrfs: fix front delete range calculation for RAID stripe extents
Date: Tue, 07 Jan 2025 13:47:34 +0100	[thread overview]
Message-ID: <20250107-rst-delete-fixes-v2-4-0c7b14c0aac2@kernel.org> (raw)
In-Reply-To: <20250107-rst-delete-fixes-v2-0-0c7b14c0aac2@kernel.org>

From: Johannes Thumshirn <johannes.thumshirn@wdc.com>

When deleting the front of a RAID stripe-extent the delete code
miscalculates the size on how much to pad the remaining extent part in the
front.

Fix the calculation so we're always having the sizes we expect.

Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
---
 fs/btrfs/raid-stripe-tree.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/raid-stripe-tree.c b/fs/btrfs/raid-stripe-tree.c
index 0c4d218a99d4aaea5da6c39624e20e77758a89d3..7fc6ef214f87d480df27023816dd800610d7dcf0 100644
--- a/fs/btrfs/raid-stripe-tree.c
+++ b/fs/btrfs/raid-stripe-tree.c
@@ -140,10 +140,12 @@ int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start, u64 le
 		 * length to the new size and then re-insert the item.
 		 */
 		if (found_end > end) {
-			u64 diff = found_end - end;
+			u64 diff_end = found_end - end;
 
 			btrfs_partially_delete_raid_extent(trans, path, &key,
-							   diff, diff);
+							   key.offset - length,
+							   length);
+			ASSERT(key.offset - diff_end == length);
 			break;
 		}
 

-- 
2.43.0


  parent reply	other threads:[~2025-01-07 12:47 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-07 12:47 [PATCH v2 00/14] btrfs: more RST delete fixes Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 01/14] btrfs: don't try to delete RAID stripe-extents if we don't need to Johannes Thumshirn
2025-01-09 10:37   ` David Sterba
2025-01-09 12:35   ` Filipe Manana
2025-01-09 14:39     ` Johannes Thumshirn
2025-01-09 15:14       ` Filipe Manana
2025-01-09 15:27         ` Johannes Thumshirn
2025-01-10 11:29           ` Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 02/14] btrfs: assert RAID stripe-extent length is always greater than 0 Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 03/14] btrfs: fix search when deleting a RAID stripe-extent Johannes Thumshirn
2025-01-09 10:42   ` David Sterba
2025-01-09 12:42   ` Filipe Manana
2025-01-09 14:13     ` Johannes Thumshirn
2025-01-07 12:47 ` Johannes Thumshirn [this message]
2025-01-07 12:47 ` [PATCH v2 05/14] btrfs: fix tail delete of RAID stripe-extents Johannes Thumshirn
2025-01-09 12:45   ` Filipe Manana
2025-01-07 12:47 ` [PATCH v2 06/14] btrfs: fix deletion of a range spanning parts two RAID stripe extents Johannes Thumshirn
2025-01-09 15:24   ` Filipe Manana
2025-01-10 11:33     ` Johannes Thumshirn
2025-01-10 16:20       ` Filipe Manana
2025-01-07 12:47 ` [PATCH v2 07/14] btrfs: implement hole punching for " Johannes Thumshirn
2025-01-09 15:32   ` Filipe Manana
2025-01-07 12:47 ` [PATCH v2 08/14] btrfs: don't use btrfs_set_item_key_safe on RAID stripe-extents Johannes Thumshirn
2025-01-09 10:50   ` David Sterba
2025-01-09 15:44   ` Filipe Manana
2025-01-09 16:00     ` Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 09/14] btrfs: selftests: check for correct return value of failed lookup Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 10/14] btrfs: selftests: don't split RAID extents in half Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 11/14] btrfs: selftests: test RAID stripe-tree deletion spanning two items Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 12/14] btrfs: selftests: add selftest for punching holes into the RAID stripe extents Johannes Thumshirn
2025-01-09 15:50   ` Filipe Manana
2025-01-07 12:47 ` [PATCH v2 13/14] btrfs: selftests: add test for punching a hole into 3 RAID stripe-extents Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 14/14] btrfs: selftests: add a selftest for deleting two out of three extents Johannes Thumshirn
2025-01-07 15:20 ` [PATCH v2 00/14] btrfs: more RST delete fixes 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=20250107-rst-delete-fixes-v2-4-0c7b14c0aac2@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®