From: Greg Kroah-Hartman Date: Tue, 9 May 2017 09:49:29 +0000 (+0200) Subject: remove 4.10 scsi patch X-Git-Tag: v4.4.68~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34be703595ed1210ec35d93ec16d1c8642b1b782;p=thirdparty%2Fkernel%2Fstable-queue.git remove 4.10 scsi patch --- diff --git a/queue-4.10/scsi-avoid-that-scsi-queues-get-stuck.patch b/queue-4.10/scsi-avoid-that-scsi-queues-get-stuck.patch deleted file mode 100644 index 393e3280942..00000000000 --- a/queue-4.10/scsi-avoid-that-scsi-queues-get-stuck.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 36e3cf273977da34a760d513e1bef8431a9abaa0 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche -Date: Fri, 7 Apr 2017 11:16:53 -0700 -Subject: scsi: Avoid that SCSI queues get stuck - -From: Bart Van Assche - -commit 36e3cf273977da34a760d513e1bef8431a9abaa0 upstream. - -If a .queue_rq() function returns BLK_MQ_RQ_QUEUE_BUSY then the block -driver that implements that function is responsible for rerunning the -hardware queue once requests can be queued again successfully. - -commit 52d7f1b5c2f3 ("blk-mq: Avoid that requeueing starts stopped -queues") removed the blk_mq_stop_hw_queue() call from scsi_queue_rq() -for the BLK_MQ_RQ_QUEUE_BUSY case. Hence change all calls to functions -that are intended to rerun a busy queue such that these examine all -hardware queues instead of only stopped queues. - -Since no other functions than scsi_internal_device_block() and -scsi_internal_device_unblock() should ever stop or restart a SCSI -queue, change the blk_mq_delay_queue() call into a -blk_mq_delay_run_hw_queue() call. - -Fixes: commit 52d7f1b5c2f3 ("blk-mq: Avoid that requeueing starts stopped queues") -Fixes: commit 7e79dadce222 ("blk-mq: stop hardware queue in blk_mq_delay_queue()") -Signed-off-by: Bart Van Assche -Cc: Martin K. Petersen -Cc: James Bottomley -Cc: Christoph Hellwig -Cc: Hannes Reinecke -Cc: Sagi Grimberg -Cc: Long Li -Cc: K. Y. Srinivasan -Signed-off-by: Jens Axboe -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/scsi/scsi_lib.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/drivers/scsi/scsi_lib.c -+++ b/drivers/scsi/scsi_lib.c -@@ -468,7 +468,7 @@ static void scsi_run_queue(struct reques - scsi_starved_list_run(sdev->host); - - if (q->mq_ops) -- blk_mq_start_stopped_hw_queues(q, false); -+ blk_mq_run_hw_queues(q, false); - else - blk_run_queue(q); - } -@@ -639,7 +639,7 @@ static bool scsi_end_request(struct requ - !list_empty(&sdev->host->starved_list)) - kblockd_schedule_work(&sdev->requeue_work); - else -- blk_mq_start_stopped_hw_queues(q, true); -+ blk_mq_run_hw_queues(q, true); - } else { - unsigned long flags; - -@@ -1953,7 +1953,7 @@ out: - case BLK_MQ_RQ_QUEUE_BUSY: - if (atomic_read(&sdev->device_busy) == 0 && - !scsi_device_blocked(sdev)) -- blk_mq_delay_queue(hctx, SCSI_QUEUE_DELAY); -+ blk_mq_delay_run_hw_queue(hctx, SCSI_QUEUE_DELAY); - break; - case BLK_MQ_RQ_QUEUE_ERROR: - /* diff --git a/queue-4.10/series b/queue-4.10/series index 4de5867744c..3aa424f35f7 100644 --- a/queue-4.10/series +++ b/queue-4.10/series @@ -95,7 +95,6 @@ scsi-qla2xxx-fix-crash-in-qla2xxx_eh_abort-on-bad-ptr.patch scsi-mac_scsi-fix-mac_scsi-m-option-when-scsi-m.patch scsi-scsi_dh_emc-return-success-in-clariion_std_inquiry.patch scsi-smartpqi-fix-time-handling.patch -scsi-avoid-that-scsi-queues-get-stuck.patch mips-r2-on-r6-multu-maddu-msubu-emulation-bugfix.patch brcmfmac-ensure-pointer-correctly-set-if-skb-data-location-changes.patch brcmfmac-make-skb-header-writable-before-use.patch