Drop btrfs-subpage-make-btrfs_submit_compressed_write-com.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.10/btrfs-subpage-make-btrfs_submit_compressed_write-com.patch b/queue-5.10/btrfs-subpage-make-btrfs_submit_compressed_write-com.patch
deleted file mode 100644 (file)
index 28c1afd..0000000
--- a/queue-5.10/btrfs-subpage-make-btrfs_submit_compressed_write-com.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 46944ab0b079958e42b2f5ec214e087c2a36faf8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 27 Sep 2021 15:22:00 +0800
-Subject: btrfs: subpage: make btrfs_submit_compressed_write() compatible
-
-From: Qu Wenruo <wqu@suse.com>
-
-[ Upstream commit bbbff01a47bfe1b7733c5ccac6a78ff6d7a8954f ]
-
-There is a WARN_ON() checking if @start is aligned to PAGE_SIZE, not
-sectorsize, which will cause false alert for subpage.  Fix it to check
-against sectorsize.
-
-Furthermore:
-
-- Use ASSERT() to do the check
-  So that in the future we may skip the check for production build
-
-- Also check alignment for @len
-
-Signed-off-by: Qu Wenruo <wqu@suse.com>
-Signed-off-by: David Sterba <dsterba@suse.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/btrfs/compression.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
-index 646416b5940e9..d3d119676a8c5 100644
---- a/fs/btrfs/compression.c
-+++ b/fs/btrfs/compression.c
-@@ -391,7 +391,8 @@ blk_status_t btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start,
-       blk_status_t ret;
-       int skip_sum = inode->flags & BTRFS_INODE_NODATASUM;
- 
--      WARN_ON(!PAGE_ALIGNED(start));
-+      ASSERT(IS_ALIGNED(start, fs_info->sectorsize) &&
-+             IS_ALIGNED(len, fs_info->sectorsize));
-       cb = kmalloc(compressed_bio_size(fs_info, compressed_len), GFP_NOFS);
-       if (!cb)
-               return BLK_STS_RESOURCE;
--- 
-2.33.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index d8fdd394fadecc01bdb724a52ec8ff59251aa712..d2dbf0bf40dbc98568b0d49d393031ceb48bdef8 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -247,7 +247,6 @@ net-annotate-data-race-in-neigh_output.patch
 acpi-ac-quirk-gk45-to-skip-reading-_psr.patch
 btrfs-reflink-initialize-return-value-to-0-in-btrfs_.patch
 btrfs-do-not-take-the-uuid_mutex-in-btrfs_rm_device.patch
-btrfs-subpage-make-btrfs_submit_compressed_write-com.patch
 spi-bcm-qspi-fix-missing-clk_disable_unprepare-on-er.patch
 wcn36xx-correct-band-freq-reporting-on-rx.patch
 x86-hyperv-protect-set_hv_tscchange_cb-against-getti.patch

diff --git a/queue-5.14/btrfs-subpage-make-btrfs_submit_compressed_write-com.patch b/queue-5.14/btrfs-subpage-make-btrfs_submit_compressed_write-com.patch
deleted file mode 100644 (file)
index d4ee32b..0000000
--- a/queue-5.14/btrfs-subpage-make-btrfs_submit_compressed_write-com.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 4fa2ff4709d87e12e150d129663270a7beaa1ffe Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 27 Sep 2021 15:22:00 +0800
-Subject: btrfs: subpage: make btrfs_submit_compressed_write() compatible
-
-From: Qu Wenruo <wqu@suse.com>
-
-[ Upstream commit bbbff01a47bfe1b7733c5ccac6a78ff6d7a8954f ]
-
-There is a WARN_ON() checking if @start is aligned to PAGE_SIZE, not
-sectorsize, which will cause false alert for subpage.  Fix it to check
-against sectorsize.
-
-Furthermore:
-
-- Use ASSERT() to do the check
-  So that in the future we may skip the check for production build
-
-- Also check alignment for @len
-
-Signed-off-by: Qu Wenruo <wqu@suse.com>
-Signed-off-by: David Sterba <dsterba@suse.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/btrfs/compression.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
-index 30d82cdf128cf..86f7eb75ea506 100644
---- a/fs/btrfs/compression.c
-+++ b/fs/btrfs/compression.c
-@@ -404,7 +404,8 @@ blk_status_t btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start,
-       const bool use_append = btrfs_use_zone_append(inode, disk_start);
-       const unsigned int bio_op = use_append ? REQ_OP_ZONE_APPEND : REQ_OP_WRITE;
- 
--      WARN_ON(!PAGE_ALIGNED(start));
-+      ASSERT(IS_ALIGNED(start, fs_info->sectorsize) &&
-+             IS_ALIGNED(len, fs_info->sectorsize));
-       cb = kmalloc(compressed_bio_size(fs_info, compressed_len), GFP_NOFS);
-       if (!cb)
-               return BLK_STS_RESOURCE;
--- 
-2.33.0
-

diff --git a/queue-5.14/series b/queue-5.14/series
index 1f6a68510559b842eb08b286ef4549f89390765a..ecd9610b9da023a3ad2f5db119dc3fef2e3b0b18 100644 (file)
--- a/queue-5.14/series
+++ b/queue-5.14/series
@@ -320,7 +320,6 @@ acpi-ac-quirk-gk45-to-skip-reading-_psr.patch
 acpi-resources-add-one-more-medion-model-in-irq-over.patch
 btrfs-reflink-initialize-return-value-to-0-in-btrfs_.patch
 btrfs-do-not-take-the-uuid_mutex-in-btrfs_rm_device.patch
-btrfs-subpage-make-btrfs_submit_compressed_write-com.patch
 spi-bcm-qspi-fix-missing-clk_disable_unprepare-on-er.patch
 wcn36xx-correct-band-freq-reporting-on-rx.patch
 wcn36xx-fix-packet-drop-on-resume.patch

diff --git a/queue-5.15/btrfs-subpage-make-btrfs_submit_compressed_write-com.patch b/queue-5.15/btrfs-subpage-make-btrfs_submit_compressed_write-com.patch
deleted file mode 100644 (file)
index 09dc899..0000000
--- a/queue-5.15/btrfs-subpage-make-btrfs_submit_compressed_write-com.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 672c2e0c104c9543e01c6badc8d8264a5eb3989f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 27 Sep 2021 15:22:00 +0800
-Subject: btrfs: subpage: make btrfs_submit_compressed_write() compatible
-
-From: Qu Wenruo <wqu@suse.com>
-
-[ Upstream commit bbbff01a47bfe1b7733c5ccac6a78ff6d7a8954f ]
-
-There is a WARN_ON() checking if @start is aligned to PAGE_SIZE, not
-sectorsize, which will cause false alert for subpage.  Fix it to check
-against sectorsize.
-
-Furthermore:
-
-- Use ASSERT() to do the check
-  So that in the future we may skip the check for production build
-
-- Also check alignment for @len
-
-Signed-off-by: Qu Wenruo <wqu@suse.com>
-Signed-off-by: David Sterba <dsterba@suse.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/btrfs/compression.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
-index 0913ee50e6c34..d0a1fe4c6e8cf 100644
---- a/fs/btrfs/compression.c
-+++ b/fs/btrfs/compression.c
-@@ -404,7 +404,8 @@ blk_status_t btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start,
-       const bool use_append = btrfs_use_zone_append(inode, disk_start);
-       const unsigned int bio_op = use_append ? REQ_OP_ZONE_APPEND : REQ_OP_WRITE;
- 
--      WARN_ON(!PAGE_ALIGNED(start));
-+      ASSERT(IS_ALIGNED(start, fs_info->sectorsize) &&
-+             IS_ALIGNED(len, fs_info->sectorsize));
-       cb = kmalloc(compressed_bio_size(fs_info, compressed_len), GFP_NOFS);
-       if (!cb)
-               return BLK_STS_RESOURCE;
--- 
-2.33.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 1076100a4bfc278a54e61b93a81af8f3c3460306..377e068dfc10bbc17b33b3bef40052fa5456e147 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -303,7 +303,6 @@ acpi-resources-add-one-more-medion-model-in-irq-over.patch
 net-dsa-flush-switchdev-workqueue-when-leaving-the-b.patch
 btrfs-reflink-initialize-return-value-to-0-in-btrfs_.patch
 btrfs-do-not-take-the-uuid_mutex-in-btrfs_rm_device.patch
-btrfs-subpage-make-btrfs_submit_compressed_write-com.patch
 spi-bcm-qspi-fix-missing-clk_disable_unprepare-on-er.patch
 wcn36xx-correct-band-freq-reporting-on-rx.patch
 wcn36xx-fix-packet-drop-on-resume.patch

diff --git a/queue-5.4/btrfs-subpage-make-btrfs_submit_compressed_write-com.patch b/queue-5.4/btrfs-subpage-make-btrfs_submit_compressed_write-com.patch
deleted file mode 100644 (file)
index 0827ea7..0000000
--- a/queue-5.4/btrfs-subpage-make-btrfs_submit_compressed_write-com.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 43eed27532e1c7b2ae261346cf8bda59a148be60 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 27 Sep 2021 15:22:00 +0800
-Subject: btrfs: subpage: make btrfs_submit_compressed_write() compatible
-
-From: Qu Wenruo <wqu@suse.com>
-
-[ Upstream commit bbbff01a47bfe1b7733c5ccac6a78ff6d7a8954f ]
-
-There is a WARN_ON() checking if @start is aligned to PAGE_SIZE, not
-sectorsize, which will cause false alert for subpage.  Fix it to check
-against sectorsize.
-
-Furthermore:
-
-- Use ASSERT() to do the check
-  So that in the future we may skip the check for production build
-
-- Also check alignment for @len
-
-Signed-off-by: Qu Wenruo <wqu@suse.com>
-Signed-off-by: David Sterba <dsterba@suse.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/btrfs/compression.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
-index 28f78e4f2c87a..fc64f75075e31 100644
---- a/fs/btrfs/compression.c
-+++ b/fs/btrfs/compression.c
-@@ -324,7 +324,8 @@ blk_status_t btrfs_submit_compressed_write(struct inode *inode, u64 start,
-       blk_status_t ret;
-       int skip_sum = BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM;
- 
--      WARN_ON(!PAGE_ALIGNED(start));
-+      ASSERT(IS_ALIGNED(start, fs_info->sectorsize) &&
-+             IS_ALIGNED(len, fs_info->sectorsize));
-       cb = kmalloc(compressed_bio_size(fs_info, compressed_len), GFP_NOFS);
-       if (!cb)
-               return BLK_STS_RESOURCE;
--- 
-2.33.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index d08a68aee088dfd9d33408fc50e270ec453c1fb9..e688928cee0957d1f22e0dbd3bdfe2b21fc12a2a 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -173,7 +173,6 @@ arm-9136-1-armv7-m-uses-be-8-not-be-32.patch
 vrf-run-conntrack-only-in-context-of-lower-physdev-f.patch
 net-annotate-data-race-in-neigh_output.patch
 btrfs-do-not-take-the-uuid_mutex-in-btrfs_rm_device.patch
-btrfs-subpage-make-btrfs_submit_compressed_write-com.patch
 spi-bcm-qspi-fix-missing-clk_disable_unprepare-on-er.patch
 x86-hyperv-protect-set_hv_tscchange_cb-against-getti.patch
 parisc-fix-warning-in-flush_tlb_all.patch