final round of SCSI updates for the 4.13+ merge window

GIT PULL James Bottomley 1 participant 1 message Sep 13, 2017 SCSI

Share & tools

James Bottomley

author maintainer

2017-09-13 14:24 UTC #0 lore raw

A tiny update: one patch corrects a Kconfig problem with the shift of the SAS SMP code to BSG and the other removes a vestige of user space target mode.

The patch is available here:

git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-misc

The short changelog is:

Arnd Bergmann (1):
scsi: scsi_transport_sas: select BLK_DEV_BSGLIB

Bart Van Assche (1):
scsi: Remove Scsi_Host.uspace_req_q

And the diffstat:

drivers/scsi/Kconfig | 2 +-
drivers/scsi/hosts.c | 8 --------
include/scsi/scsi_host.h | 6 ------

 3 files changed, 1 insertion(+), 15 deletions(-)

With full diff below.

James

---

drivers/scsi/Kconfig +1 -1

index f4538d7a3016..c470a05c7f47 100644
@@ -272,7 +272,7 @@ config SCSI_ISCSI_ATTRS
 config SCSI_SAS_ATTRS
 	tristate "SAS Transport Attributes"
 	depends on SCSI
-	select BLK_DEV_BSG
+	select BLK_DEV_BSGLIB
 	help
 	  If you wish to export transport-specific information about
 	  each attached SAS device to sysfs, say Y.

drivers/scsi/hosts.c +0 -8

index 831a1c8b9f89..fe3a0da3ec97 100644
@@ -315,8 +315,6 @@ static void scsi_host_dev_release(struct device *dev)
 {
 	struct Scsi_Host *shost = dev_to_shost(dev);
 	struct device *parent = dev->parent;
-	struct request_queue *q;
-	void *queuedata;
 
 	scsi_proc_hostdir_rm(shost->hostt);

@@ -326,12 +324,6 @@ static void scsi_host_dev_release(struct device *dev)
 		kthread_stop(shost->ehandler);
 	if (shost->work_q)
 		destroy_workqueue(shost->work_q);
-	q = shost->uspace_req_q;
-	if (q) {
-		queuedata = q->queuedata;
-		blk_cleanup_queue(q);
-		kfree(queuedata);
-	}
 
 	if (shost->shost_state == SHOST_CREATED) {
 		/*

include/scsi/scsi_host.h +0 -6

index afb04811b7b9..0a804b1a4726 100644
@@ -691,12 +691,6 @@ struct Scsi_Host {
 	unsigned int prot_capabilities;
 	unsigned char prot_guard_type;
 
-	/*
-	 * q used for scsi_tgt msgs, async events or any other requests that
-	 * need to be processed in userspace
-	 */
-	struct request_queue *uspace_req_q;
-
 	/* legacy crap */
 	unsigned long base;
 	unsigned long io_port;