diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 12:21:14 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 12:21:14 +1100 |
| commit | a7e2ea0a8203ca18cae4b8e34a7fc247f0ffa415 (patch) | |
| tree | bada37daee2665a3e2b21bf6bf5b5bfa8b0c2069 /include | |
| parent | 15a0a716b49857478b186fe5e007316e125f2681 (diff) | |
| parent | e2a3a67302fbe2431fc6d7c313073da5b2b4c293 (diff) | |
Merge remote-tracking branch 'scsi/for-next'
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) { |