drop block-make-sure-writesame-bio-is-aligned-with-logical-block-size.patch from...

diff --git a/queue-4.14/block-make-sure-writesame-bio-is-aligned-with-logical-block-size.patch b/queue-4.14/block-make-sure-writesame-bio-is-aligned-with-logical-block-size.patch
deleted file mode 100644 (file)
index b0a63d3..0000000
--- a/queue-4.14/block-make-sure-writesame-bio-is-aligned-with-logical-block-size.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 34ffec60b27aa81d04e274e71e4c6ef740f75fc7 Mon Sep 17 00:00:00 2001
-From: Ming Lei <ming.lei@redhat.com>
-Date: Mon, 29 Oct 2018 20:57:19 +0800
-Subject: block: make sure writesame bio is aligned with logical block size
-
-From: Ming Lei <ming.lei@redhat.com>
-
-commit 34ffec60b27aa81d04e274e71e4c6ef740f75fc7 upstream.
-
-Obviously the created writesame bio has to be aligned with logical block
-size, and use bio_allowed_max_sectors() to retrieve this number.
-
-Cc: stable@vger.kernel.org
-Cc: Mike Snitzer <snitzer@redhat.com>
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Xiao Ni <xni@redhat.com>
-Cc: Mariusz Dabrowski <mariusz.dabrowski@intel.com>
-Fixes: b49a0871be31a745b2ef ("block: remove split code in blkdev_issue_{discard,write_same}")
-Tested-by: Rui Salvaterra <rsalvaterra@gmail.com>
-Signed-off-by: Ming Lei <ming.lei@redhat.com>
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- block/blk-lib.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/block/blk-lib.c
-+++ b/block/blk-lib.c
-@@ -164,7 +164,7 @@ static int __blkdev_issue_write_same(str
-               return -EOPNOTSUPP;
- 
-       /* Ensure that max_write_same_sectors doesn't overflow bi_size */
--      max_write_same_sectors = UINT_MAX >> 9;
-+      max_write_same_sectors = bio_allowed_max_sectors(q);
- 
-       while (nr_sects) {
-               bio = next_bio(bio, 1, gfp_mask);

diff --git a/queue-4.14/series b/queue-4.14/series
index 2029e5873d711d09a1fce6cd0d5742c3f7975fe2..486d07ce8a7e79c4cc41351c7547d5de82173d5c 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -4,7 +4,6 @@ bcache-trace-missed-reading-by-cache_missed.patch
 bcache-fix-miss-key-refill-end-in-writeback.patch
 hwmon-pmbus-fix-page-count-auto-detection.patch
 jffs2-free-jffs2_sb_info-through-jffs2_kill_sb.patch
-block-make-sure-writesame-bio-is-aligned-with-logical-block-size.patch
 cpufreq-conservative-take-limits-changes-into-account-properly.patch
 pcmcia-implement-clkrun-protocol-disabling-for-ricoh-bridges.patch
 acpica-aml-interpreter-add-region-addresses-in-global-list-during-initialization.patch

diff --git a/queue-4.4/block-make-sure-writesame-bio-is-aligned-with-logical-block-size.patch b/queue-4.4/block-make-sure-writesame-bio-is-aligned-with-logical-block-size.patch
deleted file mode 100644 (file)
index c12d81e..0000000
--- a/queue-4.4/block-make-sure-writesame-bio-is-aligned-with-logical-block-size.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 34ffec60b27aa81d04e274e71e4c6ef740f75fc7 Mon Sep 17 00:00:00 2001
-From: Ming Lei <ming.lei@redhat.com>
-Date: Mon, 29 Oct 2018 20:57:19 +0800
-Subject: block: make sure writesame bio is aligned with logical block size
-
-From: Ming Lei <ming.lei@redhat.com>
-
-commit 34ffec60b27aa81d04e274e71e4c6ef740f75fc7 upstream.
-
-Obviously the created writesame bio has to be aligned with logical block
-size, and use bio_allowed_max_sectors() to retrieve this number.
-
-Cc: stable@vger.kernel.org
-Cc: Mike Snitzer <snitzer@redhat.com>
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Xiao Ni <xni@redhat.com>
-Cc: Mariusz Dabrowski <mariusz.dabrowski@intel.com>
-Fixes: b49a0871be31a745b2ef ("block: remove split code in blkdev_issue_{discard,write_same}")
-Tested-by: Rui Salvaterra <rsalvaterra@gmail.com>
-Signed-off-by: Ming Lei <ming.lei@redhat.com>
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- block/blk-lib.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/block/blk-lib.c
-+++ b/block/blk-lib.c
-@@ -156,7 +156,7 @@ int blkdev_issue_write_same(struct block
-               return -ENXIO;
- 
-       /* Ensure that max_write_same_sectors doesn't overflow bi_size */
--      max_write_same_sectors = UINT_MAX >> 9;
-+      max_write_same_sectors = bio_allowed_max_sectors(q);
- 
-       atomic_set(&bb.done, 1);
-       bb.error = 0;

diff --git a/queue-4.4/series b/queue-4.4/series
index 90250ccac826974b36f9ac149f312726e566557a..7a754e5644e35816e15f7bb9084228c7452154a4 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1,7 +1,6 @@
 bcache-fix-miss-key-refill-end-in-writeback.patch
 hwmon-pmbus-fix-page-count-auto-detection.patch
 jffs2-free-jffs2_sb_info-through-jffs2_kill_sb.patch
-block-make-sure-writesame-bio-is-aligned-with-logical-block-size.patch
 pcmcia-implement-clkrun-protocol-disabling-for-ricoh-bridges.patch
 acpica-aml-interpreter-add-region-addresses-in-global-list-during-initialization.patch
 ipmi-fix-timer-race-with-module-unload.patch

diff --git a/queue-4.9/block-make-sure-writesame-bio-is-aligned-with-logical-block-size.patch b/queue-4.9/block-make-sure-writesame-bio-is-aligned-with-logical-block-size.patch
deleted file mode 100644 (file)
index d98ee03..0000000
--- a/queue-4.9/block-make-sure-writesame-bio-is-aligned-with-logical-block-size.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 34ffec60b27aa81d04e274e71e4c6ef740f75fc7 Mon Sep 17 00:00:00 2001
-From: Ming Lei <ming.lei@redhat.com>
-Date: Mon, 29 Oct 2018 20:57:19 +0800
-Subject: block: make sure writesame bio is aligned with logical block size
-
-From: Ming Lei <ming.lei@redhat.com>
-
-commit 34ffec60b27aa81d04e274e71e4c6ef740f75fc7 upstream.
-
-Obviously the created writesame bio has to be aligned with logical block
-size, and use bio_allowed_max_sectors() to retrieve this number.
-
-Cc: stable@vger.kernel.org
-Cc: Mike Snitzer <snitzer@redhat.com>
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Xiao Ni <xni@redhat.com>
-Cc: Mariusz Dabrowski <mariusz.dabrowski@intel.com>
-Fixes: b49a0871be31a745b2ef ("block: remove split code in blkdev_issue_{discard,write_same}")
-Tested-by: Rui Salvaterra <rsalvaterra@gmail.com>
-Signed-off-by: Ming Lei <ming.lei@redhat.com>
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- block/blk-lib.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/block/blk-lib.c
-+++ b/block/blk-lib.c
-@@ -165,7 +165,7 @@ int blkdev_issue_write_same(struct block
-               return -EINVAL;
- 
-       /* Ensure that max_write_same_sectors doesn't overflow bi_size */
--      max_write_same_sectors = UINT_MAX >> 9;
-+      max_write_same_sectors = bio_allowed_max_sectors(q);
- 
-       while (nr_sects) {
-               bio = next_bio(bio, 1, gfp_mask);

diff --git a/queue-4.9/series b/queue-4.9/series
index 90250ccac826974b36f9ac149f312726e566557a..7a754e5644e35816e15f7bb9084228c7452154a4 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -1,7 +1,6 @@
 bcache-fix-miss-key-refill-end-in-writeback.patch
 hwmon-pmbus-fix-page-count-auto-detection.patch
 jffs2-free-jffs2_sb_info-through-jffs2_kill_sb.patch
-block-make-sure-writesame-bio-is-aligned-with-logical-block-size.patch
 pcmcia-implement-clkrun-protocol-disabling-for-ricoh-bridges.patch
 acpica-aml-interpreter-add-region-addresses-in-global-list-during-initialization.patch
 ipmi-fix-timer-race-with-module-unload.patch