From d6ec0c3524224664d5d3edbcc51648a3ddb0e557 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 16 Sep 2023 14:38:00 +0200 Subject: [PATCH] drop a btrfs patch --- ...etadata_uuid-in-btrfs_validate_super.patch | 61 ------------------- queue-6.1/series | 1 - ...etadata_uuid-in-btrfs_validate_super.patch | 61 ------------------- queue-6.5/series | 1 - 4 files changed, 124 deletions(-) delete mode 100644 queue-6.1/btrfs-compare-the-correct-fsid-metadata_uuid-in-btrfs_validate_super.patch delete mode 100644 queue-6.5/btrfs-compare-the-correct-fsid-metadata_uuid-in-btrfs_validate_super.patch diff --git a/queue-6.1/btrfs-compare-the-correct-fsid-metadata_uuid-in-btrfs_validate_super.patch b/queue-6.1/btrfs-compare-the-correct-fsid-metadata_uuid-in-btrfs_validate_super.patch deleted file mode 100644 index 6a2891cbd7b..00000000000 --- a/queue-6.1/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 -Date: Mon, 31 Jul 2023 19:16:35 +0800 -Subject: btrfs: compare the correct fsid/metadata_uuid in btrfs_validate_super - -From: Anand Jain - -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 -Tested-by: Guilherme G. Piccoli -Signed-off-by: Anand Jain -Reviewed-by: David Sterba -Signed-off-by: David Sterba -Signed-off-by: Greg Kroah-Hartman ---- - 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 -@@ -2728,13 +2728,11 @@ int btrfs_validate_super(struct btrfs_fs - 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-6.1/series b/queue-6.1/series index 1ec5f7ebefe..a201d94df62 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -159,7 +159,6 @@ btrfs-don-t-start-transaction-when-joining-with-trans_join_nostart.patch btrfs-set-page-extent-mapped-after-read_folio-in-relocate_one_page.patch btrfs-zoned-re-enable-metadata-over-commit-for-zoned-mode.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 drm-mxsfb-disable-overlay-plane-in-mxsfb_plane_overlay_atomic_disable.patch mtd-rawnand-brcmnand-fix-crash-during-the-panic_write.patch mtd-rawnand-brcmnand-fix-potential-out-of-bounds-access-in-oob-write.patch diff --git a/queue-6.5/btrfs-compare-the-correct-fsid-metadata_uuid-in-btrfs_validate_super.patch b/queue-6.5/btrfs-compare-the-correct-fsid-metadata_uuid-in-btrfs_validate_super.patch deleted file mode 100644 index 0719a45957c..00000000000 --- a/queue-6.5/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 -Date: Mon, 31 Jul 2023 19:16:35 +0800 -Subject: btrfs: compare the correct fsid/metadata_uuid in btrfs_validate_super - -From: Anand Jain - -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 -Tested-by: Guilherme G. Piccoli -Signed-off-by: Anand Jain -Reviewed-by: David Sterba -Signed-off-by: David Sterba -Signed-off-by: Greg Kroah-Hartman ---- - 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 -@@ -2391,13 +2391,11 @@ int btrfs_validate_super(struct btrfs_fs - 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-6.5/series b/queue-6.5/series index dc783877406..80cb941d64c 100644 --- a/queue-6.5/series +++ b/queue-6.5/series @@ -207,7 +207,6 @@ btrfs-don-t-start-transaction-when-joining-with-trans_join_nostart.patch btrfs-set-page-extent-mapped-after-read_folio-in-relocate_one_page.patch btrfs-zoned-re-enable-metadata-over-commit-for-zoned-mode.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 btrfs-scrub-avoid-unnecessary-extent-tree-search-preparing-stripes.patch btrfs-scrub-avoid-unnecessary-csum-tree-search-preparing-stripes.patch btrfs-scrub-fix-grouping-of-read-io.patch -- 2.47.3