Skip to content

Commit

Permalink
scsi: Remove Scsi_Host.uspace_req_q
Browse files Browse the repository at this point in the history
A patch I wrote myself several years ago removed SCSI target support
from the code under drivers/scsi. That patch removed the code that sets
uspace_req_q to a non-NULL value. Hence also remove the code that
depends on uspace_req_q != NULL.

References: commit 0664652 ("tgt: removal")
Signed-off-by: Bart Van Assche <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: Hannes Reinecke <[email protected]>
Cc: Johannes Thumshirn <[email protected]>
Reviewed-by: Johannes Thumshirn <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Martin K. Petersen <[email protected]>
  • Loading branch information
KAGA-KOKO authored and martinkpetersen committed Sep 5, 2017
1 parent a45a1f3 commit 7760e22
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
8 changes: 0 additions & 8 deletions drivers/scsi/hosts.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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) {
/*
Expand Down
6 changes: 0 additions & 6 deletions include/scsi/scsi_host.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 7760e22

Please sign in to comment.