Commit 4f846664 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by sanglipeng
Browse files

Revert "btrfs: add dmesg output for first mount and last unmount of a filesystem" 

stable inclusion
from stable-v5.10.204
commit 8cb1209989fb333a24dee33c21e43043108c5024
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9J4PL

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8cb1209989fb333a24dee33c21e43043108c5024

--------------------------------

This reverts commit 2d6c2238acf8043ec71cdede3542efd54e02798a 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: default avatarGuenter Roeck <linux@roeck-us.net>
Reported-by: default avatarNathan 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent c3200ad0

fs/btrfs/disk-io.c

+0 −1
Original line number Diff line number Diff line
@@ -2981,7 +2981,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device 
		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

fs/btrfs/super.c

+1 −4
Original line number Diff line number Diff line
@@ -318,10 +318,7 @@ void __btrfs_panic(struct btrfs_fs_info *fs_info, const char *function, 


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 {