5.4-stable patches

added patches:
	revert-btrfs-add-dmesg-output-for-first-mount-and-last-unmount-of-a-filesystem.patch

diff --git a/queue-5.4/revert-btrfs-add-dmesg-output-for-first-mount-and-last-unmount-of-a-filesystem.patch b/queue-5.4/revert-btrfs-add-dmesg-output-for-first-mount-and-last-unmount-of-a-filesystem.patch
new file mode 100644 (file)
index 0000000..1c3fc33
--- /dev/null
+++ b/queue-5.4/revert-btrfs-add-dmesg-output-for-first-mount-and-last-unmount-of-a-filesystem.patch
@@ -0,0 +1,54 @@
+From 910164f3394f3f2036b5655eae72c49f9b0ad800 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Mon, 11 Dec 2023 15:52:30 +0100
+Subject: Revert "btrfs: add dmesg output for first mount and last unmount of a filesystem"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit dd94ffab1b6d84b3ba9a8d09b6b0f44610d397eb which is
+commit 2db313205f8b96eea467691917138d646bb50aef upstream.
+
+As pointed out by many, the disk_super structure is NOT initialized
+before it is dereferenced in the function
+fs/btrfs/disk-io.c:open_ctree() that this commit adds, so something went
+wrong here.
+
+Revert it for now until it gets straightened out.
+
+Link: https://lore.kernel.org/r/5b0eb360-3765-40e1-854a-9da6d97eb405@roeck-us.net
+Link: https://lore.kernel.org/r/20231209172836.GA2154579@dev-arch.thelio-3990X
+Reported-by: Guenter Roeck <linux@roeck-us.net>
+Reported-by: Nathan Chancellor <nathan@kernel.org>
+Cc: Anand Jain <anand.jain@oracle.com>
+Cc: Qu Wenruo <wqu@suse.com>
+Cc: David Sterba <dsterba@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/btrfs/disk-io.c |    1 -
+ fs/btrfs/super.c   |    5 +----
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+
+--- a/fs/btrfs/disk-io.c
++++ b/fs/btrfs/disk-io.c
+@@ -2829,7 +2829,6 @@ int open_ctree(struct super_block *sb,
+               goto fail_alloc;
+       }
+ 
+-      btrfs_info(fs_info, "first mount of filesystem %pU", disk_super->fsid);
+       /*
+        * Verify the type first, if that or the checksum value are
+        * corrupted, we'll find out
+--- a/fs/btrfs/super.c
++++ b/fs/btrfs/super.c
+@@ -291,10 +291,7 @@ void __btrfs_panic(struct btrfs_fs_info
+ 
+ static void btrfs_put_super(struct super_block *sb)
+ {
+-      struct btrfs_fs_info *fs_info = btrfs_sb(sb);
+-
+-      btrfs_info(fs_info, "last unmount of filesystem %pU", fs_info->fs_devices->fsid);
+-      close_ctree(fs_info);
++      close_ctree(btrfs_sb(sb));
+ }
+ 
+ enum {

diff --git a/queue-5.4/series b/queue-5.4/series
index b3fff64d7bb3e04c27a455719a4cde9d256b4357..f16611b6c360d03f4337a4868d1665fd06b128b0 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -60,3 +60,4 @@ genetlink-add-cap_net_admin-test-for-multicast-bind.patch
 psample-require-cap_net_admin-when-joining-packets-group.patch
 drop_monitor-require-cap_sys_admin-when-joining-events-group.patch
 tools-headers-uapi-sync-linux-perf_event.h-with-the-kernel-sources.patch
+revert-btrfs-add-dmesg-output-for-first-mount-and-last-unmount-of-a-filesystem.patch