From: Greg Kroah-Hartman Date: Mon, 11 Dec 2023 14:56:33 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v4.14.333~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e071ea388570a991e2b7b166597c99039c5115c0;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: revert-btrfs-add-dmesg-output-for-first-mount-and-last-unmount-of-a-filesystem.patch --- diff --git a/queue-5.15/revert-btrfs-add-dmesg-output-for-first-mount-and-last-unmount-of-a-filesystem.patch b/queue-5.15/revert-btrfs-add-dmesg-output-for-first-mount-and-last-unmount-of-a-filesystem.patch new file mode 100644 index 00000000000..856c0760baa --- /dev/null +++ b/queue-5.15/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 +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 + +This reverts commit a480eb262b178e2baffa758b9cd5bde2d8470287 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 +Reported-by: Nathan Chancellor +Cc: Anand Jain +Cc: Qu Wenruo +Cc: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -3204,7 +3204,6 @@ int __cold open_ctree(struct super_block + 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 +@@ -337,10 +337,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.15/series b/queue-5.15/series index 91cdcbdf479..c770f5ddc1c 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -134,3 +134,4 @@ kvm-s390-mm-properly-reset-no-dat.patch kvm-svm-update-efer-software-model-on-cr0-trap-for-sev-es.patch mips-loongson64-reserve-vgabios-memory-on-boot.patch mips-loongson64-enable-dma-noncoherent-support.patch +revert-btrfs-add-dmesg-output-for-first-mount-and-last-unmount-of-a-filesystem.patch