This is a note to let you know that I've just added the patch titled
btrfs: add block-group tree to lockdep classes
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
btrfs-add-block-group-tree-to-lockdep-classes.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 1a1b0e729d227f9f758f7b5f1c997e874e94156e Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@xxxxxxxx>
Date: Thu, 1 Jun 2023 00:33:01 +0200
Subject: btrfs: add block-group tree to lockdep classes
From: David Sterba <dsterba@xxxxxxxx>
commit 1a1b0e729d227f9f758f7b5f1c997e874e94156e upstream.
The block group tree was not present among the lockdep classes. We could
get potentially lockdep warnings but so far none has been seen, also
because block-group-tree is a relatively new feature.
CC: stable@xxxxxxxxxxxxxxx # 6.1+
Signed-off-by: David Sterba <dsterba@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/btrfs/locking.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/fs/btrfs/locking.c
+++ b/fs/btrfs/locking.c
@@ -56,8 +56,8 @@
static struct btrfs_lockdep_keyset {
u64 id; /* root objectid */
- /* Longest entry: btrfs-free-space-00 */
- char names[BTRFS_MAX_LEVEL][20];
+ /* Longest entry: btrfs-block-group-00 */
+ char names[BTRFS_MAX_LEVEL][24];
struct lock_class_key keys[BTRFS_MAX_LEVEL];
} btrfs_lockdep_keysets[] = {
{ .id = BTRFS_ROOT_TREE_OBJECTID, DEFINE_NAME("root") },
@@ -71,6 +71,7 @@ static struct btrfs_lockdep_keyset {
{ .id = BTRFS_DATA_RELOC_TREE_OBJECTID, DEFINE_NAME("dreloc") },
{ .id = BTRFS_UUID_TREE_OBJECTID, DEFINE_NAME("uuid") },
{ .id = BTRFS_FREE_SPACE_TREE_OBJECTID, DEFINE_NAME("free-space") },
+ { .id = BTRFS_BLOCK_GROUP_TREE_OBJECTID, DEFINE_NAME("block-group") },
{ .id = 0, DEFINE_NAME("tree") },
};
Patches currently in stable-queue which might be from dsterba@xxxxxxxx are
queue-6.1/btrfs-add-handling-for-raid1c23-dup-to-btrfs_reduce_alloc_profile.patch
queue-6.1/btrfs-bail-out-reclaim-process-if-filesystem-is-read-only.patch
queue-6.1/btrfs-do-not-bug_on-on-tree-mod-log-failure-at-balan.patch
queue-6.1/btrfs-add-block-group-tree-to-lockdep-classes.patch
queue-6.1/btrfs-fix-extent-buffer-leak-after-tree-mod-log-failure-at-split_node.patch
queue-6.1/btrfs-fix-race-when-deleting-free-space-root-from-the-dirty-cow-roots-list.patch
queue-6.1/btrfs-move-out-now-unused-bg-from-the-reclaim-list.patch
queue-6.1/btrfs-fix-race-when-deleting-quota-root-from-the-dirty-cow-roots-list.patch
queue-6.1/btrfs-delete-unused-bgs-while-reclaiming-bgs.patch
queue-6.1/btrfs-do-not-bug_on-on-tree-mod-log-failure-at-__btrfs_cow_block.patch
queue-6.1/btrfs-reinsert-bgs-failed-to-reclaim.patch
