From: Greg Kroah-Hartman Date: Sat, 10 Nov 2018 17:41:32 +0000 (-0800) Subject: drop block-make-sure-writesame-bio-is-aligned-with-logical-block-size.patch from... X-Git-Tag: v4.19.2~80 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c5891969e0508f625b51923a86f39dcdb49128b;p=thirdparty%2Fkernel%2Fstable-queue.git drop block-make-sure-writesame-bio-is-aligned-with-logical-block-size.patch from a bunch of trees --- 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 index b0a63d3d300..00000000000 --- 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 -Date: Mon, 29 Oct 2018 20:57:19 +0800 -Subject: block: make sure writesame bio is aligned with logical block size - -From: Ming Lei - -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 -Cc: Christoph Hellwig -Cc: Xiao Ni -Cc: Mariusz Dabrowski -Fixes: b49a0871be31a745b2ef ("block: remove split code in blkdev_issue_{discard,write_same}") -Tested-by: Rui Salvaterra -Signed-off-by: Ming Lei -Signed-off-by: Jens Axboe -Signed-off-by: Greg Kroah-Hartman - ---- - 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 2029e5873d7..486d07ce8a7 100644 --- 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 index c12d81ea19f..00000000000 --- 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 -Date: Mon, 29 Oct 2018 20:57:19 +0800 -Subject: block: make sure writesame bio is aligned with logical block size - -From: Ming Lei - -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 -Cc: Christoph Hellwig -Cc: Xiao Ni -Cc: Mariusz Dabrowski -Fixes: b49a0871be31a745b2ef ("block: remove split code in blkdev_issue_{discard,write_same}") -Tested-by: Rui Salvaterra -Signed-off-by: Ming Lei -Signed-off-by: Jens Axboe -Signed-off-by: Greg Kroah-Hartman - ---- - 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 90250ccac82..7a754e5644e 100644 --- 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 index d98ee036e5f..00000000000 --- 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 -Date: Mon, 29 Oct 2018 20:57:19 +0800 -Subject: block: make sure writesame bio is aligned with logical block size - -From: Ming Lei - -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 -Cc: Christoph Hellwig -Cc: Xiao Ni -Cc: Mariusz Dabrowski -Fixes: b49a0871be31a745b2ef ("block: remove split code in blkdev_issue_{discard,write_same}") -Tested-by: Rui Salvaterra -Signed-off-by: Ming Lei -Signed-off-by: Jens Axboe -Signed-off-by: Greg Kroah-Hartman - ---- - 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 90250ccac82..7a754e5644e 100644 --- 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