drop queue-5.4/btrfs-compare-the-correct-fsid-metadata_uuid-in-btrfs_validate_super...

diff --git a/queue-5.4/btrfs-compare-the-correct-fsid-metadata_uuid-in-btrfs_validate_super.patch b/queue-5.4/btrfs-compare-the-correct-fsid-metadata_uuid-in-btrfs_validate_super.patch
deleted file mode 100644 (file)
index 830d5d9..0000000
--- a/queue-5.4/btrfs-compare-the-correct-fsid-metadata_uuid-in-btrfs_validate_super.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 6bfe3959b0e7a526f5c64747801a8613f002f05a Mon Sep 17 00:00:00 2001
-From: Anand Jain <anand.jain@oracle.com>
-Date: Mon, 31 Jul 2023 19:16:35 +0800
-Subject: btrfs: compare the correct fsid/metadata_uuid in btrfs_validate_super
-
-From: Anand Jain <anand.jain@oracle.com>
-
-commit 6bfe3959b0e7a526f5c64747801a8613f002f05a upstream.
-
-The function btrfs_validate_super() should verify the metadata_uuid in
-the provided superblock argument. Because, all its callers expect it to
-do that.
-
-Such as in the following stacks:
-
-  write_all_supers()
-   sb = fs_info->super_for_commit;
-   btrfs_validate_write_super(.., sb)
-     btrfs_validate_super(.., sb, ..)
-
-  scrub_one_super()
-       btrfs_validate_super(.., sb, ..)
-
-And
-   check_dev_super()
-       btrfs_validate_super(.., sb, ..)
-
-However, it currently verifies the fs_info::super_copy::metadata_uuid
-instead.  Fix this using the correct metadata_uuid in the superblock
-argument.
-
-CC: stable@vger.kernel.org # 5.4+
-Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
-Tested-by: Guilherme G. Piccoli <gpiccoli@igalia.com>
-Signed-off-by: Anand Jain <anand.jain@oracle.com>
-Reviewed-by: David Sterba <dsterba@suse.com>
-Signed-off-by: David Sterba <dsterba@suse.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/btrfs/disk-io.c |    8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
---- a/fs/btrfs/disk-io.c
-+++ b/fs/btrfs/disk-io.c
-@@ -2487,13 +2487,11 @@ static int validate_super(struct btrfs_f
-               ret = -EINVAL;
-       }
- 
--      if (btrfs_fs_incompat(fs_info, METADATA_UUID) &&
--          memcmp(fs_info->fs_devices->metadata_uuid,
--                 fs_info->super_copy->metadata_uuid, BTRFS_FSID_SIZE)) {
-+      if (memcmp(fs_info->fs_devices->metadata_uuid, btrfs_sb_fsid_ptr(sb),
-+                 BTRFS_FSID_SIZE) != 0) {
-               btrfs_err(fs_info,
- "superblock metadata_uuid doesn't match metadata uuid of fs_devices: %pU != %pU",
--                      fs_info->super_copy->metadata_uuid,
--                      fs_info->fs_devices->metadata_uuid);
-+                        btrfs_sb_fsid_ptr(sb), fs_info->fs_devices->metadata_uuid);
-               ret = -EINVAL;
-       }
- 

diff --git a/queue-5.4/series b/queue-5.4/series
index c53cf5a731aa976190d10b2d4159e1537086c22b..469c25e57b42d5104092df608b6011359e3e3298 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -282,7 +282,6 @@ ata-pata_ftide010-add-missing-module_description.patch
 fuse-nlookup-missing-decrement-in-fuse_direntplus_link.patch
 btrfs-don-t-start-transaction-when-joining-with-trans_join_nostart.patch
 btrfs-use-the-correct-superblock-to-compare-fsid-in-btrfs_validate_super.patch
-btrfs-compare-the-correct-fsid-metadata_uuid-in-btrfs_validate_super.patch
 mtd-rawnand-brcmnand-fix-crash-during-the-panic_write.patch
 mtd-rawnand-brcmnand-fix-potential-out-of-bounds-access-in-oob-write.patch
 mtd-rawnand-brcmnand-fix-potential-false-time-out-warning.patch