drop scsi patch from 5.2 and 5.3

diff --git a/queue-5.2/scsi-implement-.cleanup_rq-callback.patch b/queue-5.2/scsi-implement-.cleanup_rq-callback.patch
deleted file mode 100644 (file)
index 0712b48..0000000
--- a/queue-5.2/scsi-implement-.cleanup_rq-callback.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b7e9e1fb7a9227be34ad4a5e778022c3164494cf Mon Sep 17 00:00:00 2001
-From: Ming Lei <ming.lei@redhat.com>
-Date: Thu, 25 Jul 2019 10:05:00 +0800
-Subject: scsi: implement .cleanup_rq callback
-
-From: Ming Lei <ming.lei@redhat.com>
-
-commit b7e9e1fb7a9227be34ad4a5e778022c3164494cf upstream.
-
-Implement .cleanup_rq() callback for freeing driver private part
-of the request. Then we can avoid to leak this part if the request isn't
-completed by SCSI, and freed by blk-mq or upper layer(such as dm-rq) finally.
-
-Cc: Ewan D. Milne <emilne@redhat.com>
-Cc: Bart Van Assche <bvanassche@acm.org>
-Cc: Hannes Reinecke <hare@suse.com>
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Mike Snitzer <snitzer@redhat.com>
-Cc: dm-devel@redhat.com
-Cc: <stable@vger.kernel.org>
-Fixes: 396eaf21ee17 ("blk-mq: improve DM's blk-mq IO merging via blk_insert_cloned_request feedback")
-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>
-
----
- drivers/scsi/scsi_lib.c |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/drivers/scsi/scsi_lib.c
-+++ b/drivers/scsi/scsi_lib.c
-@@ -1073,6 +1073,18 @@ static void scsi_initialize_rq(struct re
-       cmd->retries = 0;
- }
- 
-+/*
-+ * Only called when the request isn't completed by SCSI, and not freed by
-+ * SCSI
-+ */
-+static void scsi_cleanup_rq(struct request *rq)
-+{
-+      if (rq->rq_flags & RQF_DONTPREP) {
-+              scsi_mq_uninit_cmd(blk_mq_rq_to_pdu(rq));
-+              rq->rq_flags &= ~RQF_DONTPREP;
-+      }
-+}
-+
- /* Add a command to the list used by the aacraid and dpt_i2o drivers */
- void scsi_add_cmd_to_list(struct scsi_cmnd *cmd)
- {
-@@ -1800,6 +1812,7 @@ static const struct blk_mq_ops scsi_mq_o
-       .init_request   = scsi_mq_init_request,
-       .exit_request   = scsi_mq_exit_request,
-       .initialize_rq_fn = scsi_initialize_rq,
-+      .cleanup_rq     = scsi_cleanup_rq,
-       .busy           = scsi_mq_lld_busy,
-       .map_queues     = scsi_map_queues,
- };

diff --git a/queue-5.2/series b/queue-5.2/series
index 241c9734d1102dfae4c6db83ff6a15bfba9c6cf2..5da31505caca6f28b18616c90b3ded2bf49ced74 100644 (file)
--- a/queue-5.2/series
+++ b/queue-5.2/series
@@ -217,7 +217,6 @@ arm-omap2plus_defconfig-fix-missing-video.patch
 iwlwifi-fw-don-t-send-geo_tx_power_limit-command-to-fw-version-36.patch
 alsa-firewire-tascam-handle-error-code-when-getting-current-source-of-clock.patch
 alsa-firewire-tascam-check-intermediate-state-of-clock-status-and-retry.patch
-scsi-implement-.cleanup_rq-callback.patch
 scsi-scsi_dh_rdac-zero-cdb-in-send_mode_select.patch
 scsi-qla2xxx-fix-relogin-to-prevent-modifying-scan_state-flag.patch
 printk-do-not-lose-last-line-in-kmsg-buffer-dump.patch

diff --git a/queue-5.3/scsi-implement-.cleanup_rq-callback.patch b/queue-5.3/scsi-implement-.cleanup_rq-callback.patch
deleted file mode 100644 (file)
index 5e970c6..0000000
--- a/queue-5.3/scsi-implement-.cleanup_rq-callback.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b7e9e1fb7a9227be34ad4a5e778022c3164494cf Mon Sep 17 00:00:00 2001
-From: Ming Lei <ming.lei@redhat.com>
-Date: Thu, 25 Jul 2019 10:05:00 +0800
-Subject: scsi: implement .cleanup_rq callback
-
-From: Ming Lei <ming.lei@redhat.com>
-
-commit b7e9e1fb7a9227be34ad4a5e778022c3164494cf upstream.
-
-Implement .cleanup_rq() callback for freeing driver private part
-of the request. Then we can avoid to leak this part if the request isn't
-completed by SCSI, and freed by blk-mq or upper layer(such as dm-rq) finally.
-
-Cc: Ewan D. Milne <emilne@redhat.com>
-Cc: Bart Van Assche <bvanassche@acm.org>
-Cc: Hannes Reinecke <hare@suse.com>
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Mike Snitzer <snitzer@redhat.com>
-Cc: dm-devel@redhat.com
-Cc: <stable@vger.kernel.org>
-Fixes: 396eaf21ee17 ("blk-mq: improve DM's blk-mq IO merging via blk_insert_cloned_request feedback")
-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>
-
----
- drivers/scsi/scsi_lib.c |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/drivers/scsi/scsi_lib.c
-+++ b/drivers/scsi/scsi_lib.c
-@@ -1089,6 +1089,18 @@ static void scsi_initialize_rq(struct re
-       cmd->retries = 0;
- }
- 
-+/*
-+ * Only called when the request isn't completed by SCSI, and not freed by
-+ * SCSI
-+ */
-+static void scsi_cleanup_rq(struct request *rq)
-+{
-+      if (rq->rq_flags & RQF_DONTPREP) {
-+              scsi_mq_uninit_cmd(blk_mq_rq_to_pdu(rq));
-+              rq->rq_flags &= ~RQF_DONTPREP;
-+      }
-+}
-+
- /* Add a command to the list used by the aacraid and dpt_i2o drivers */
- void scsi_add_cmd_to_list(struct scsi_cmnd *cmd)
- {
-@@ -1821,6 +1833,7 @@ static const struct blk_mq_ops scsi_mq_o
-       .init_request   = scsi_mq_init_request,
-       .exit_request   = scsi_mq_exit_request,
-       .initialize_rq_fn = scsi_initialize_rq,
-+      .cleanup_rq     = scsi_cleanup_rq,
-       .busy           = scsi_mq_lld_busy,
-       .map_queues     = scsi_map_queues,
- };

diff --git a/queue-5.3/series b/queue-5.3/series
index f6935f5f7f4b54a76ac86048638a2faf301b50ee..39cede0b2fe3d3b1aacc9f744426aa24b8e2f06b 100644 (file)
--- a/queue-5.3/series
+++ b/queue-5.3/series
@@ -239,7 +239,6 @@ arm-omap2plus_defconfig-fix-missing-video.patch
 iwlwifi-fw-don-t-send-geo_tx_power_limit-command-to-fw-version-36.patch
 alsa-firewire-tascam-handle-error-code-when-getting-current-source-of-clock.patch
 alsa-firewire-tascam-check-intermediate-state-of-clock-status-and-retry.patch
-scsi-implement-.cleanup_rq-callback.patch
 scsi-scsi_dh_rdac-zero-cdb-in-send_mode_select.patch
 scsi-qla2xxx-fix-relogin-to-prevent-modifying-scan_state-flag.patch
 printk-do-not-lose-last-line-in-kmsg-buffer-dump.patch