diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-03-07 15:13:02 -0800 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-03-07 15:13:02 -0800 |
| commit | e2a3a67302fbe2431fc6d7c313073da5b2b4c293 (patch) | |
| tree | 597537c90146c7f27f8dcd7937743fa612fb496a /include | |
| parent | c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 (diff) | |
| parent | eeb810849a20e32aa1b60335e46ea5446ba07e1f (diff) | |
| download | linux-e2a3a67302fbe2431fc6d7c313073da5b2b4c293.tar.gz linux-e2a3a67302fbe2431fc6d7c313073da5b2b4c293.tar.bz2 linux-e2a3a67302fbe2431fc6d7c313073da5b2b4c293.zip | |
Merge remote-tracking branch 'mkp-scsi/fixes' into fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/libiscsi.h | 1 | ||||
| -rw-r--r-- | include/scsi/scsi_device.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h index b0e275de6dec..583875ea136a 100644 --- a/include/scsi/libiscsi.h +++ b/include/scsi/libiscsi.h @@ -196,6 +196,7 @@ struct iscsi_conn { struct iscsi_task *task; /* xmit task in progress */ /* xmit */ + spinlock_t taskqueuelock; /* protects the next three lists */ struct list_head mgmtqueue; /* mgmt (control) xmit queue */ struct list_head cmdqueue; /* data-path cmd queue */ struct list_head requeue; /* tasks needing another run */ diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 6f22b39f1b0c..080c7ce9bae8 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -472,6 +472,10 @@ static inline int scsi_device_created(struct scsi_device *sdev) sdev->sdev_state == SDEV_CREATED_BLOCK; } +int scsi_internal_device_block(struct scsi_device *sdev, bool wait); +int scsi_internal_device_unblock(struct scsi_device *sdev, + enum scsi_device_state new_state); + /* accessor functions for the SCSI parameters */ static inline int scsi_device_sync(struct scsi_device *sdev) { |