diff options
| author | Christoph Hellwig <hch@lst.de> | 2014-10-11 12:06:47 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-11-12 11:16:10 +0100 |
| commit | 176aa9d6ee2db582e7e856dbe1983004a82869b4 (patch) | |
| tree | 5c1e97cbdc98dd9162ef6f81af19eca932f8117e /include/scsi | |
| parent | 1ee8e889d946b3b1c2cc8b99e29eac47d1581dfd (diff) | |
| download | linux-176aa9d6ee2db582e7e856dbe1983004a82869b4.tar.gz linux-176aa9d6ee2db582e7e856dbe1983004a82869b4.tar.bz2 linux-176aa9d6ee2db582e7e856dbe1983004a82869b4.zip | |
scsi: refactor scsi_reset_provider handling
Pull the common code from the two callers into the function,
and rename it to scsi_ioctl_reset.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/scsi_eh.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h index 256248141322..1e1421b06565 100644 --- a/include/scsi/scsi_eh.h +++ b/include/scsi/scsi_eh.h @@ -60,20 +60,7 @@ extern int scsi_get_sense_info_fld(const u8 * sense_buffer, int sb_len, extern void scsi_build_sense_buffer(int desc, u8 *buf, u8 key, u8 asc, u8 ascq); -/* - * Reset request from external source - * Note: if SCSI_TRY_RESET_DEVICE fails then it will escalate to - * SCSI_TRY_RESET_TARGET which if it fails will escalate to - * SCSI_TRY_RESET_BUS which if it fails will escalate to SCSI_TRY_RESET_HOST. - * To prevent escalation OR with SCSI_TRY_RESET_NO_ESCALATE. - */ -#define SCSI_TRY_RESET_DEVICE 1 -#define SCSI_TRY_RESET_BUS 2 -#define SCSI_TRY_RESET_HOST 3 -#define SCSI_TRY_RESET_TARGET 4 -#define SCSI_TRY_RESET_NO_ESCALATE 0x100 /* OR-ed to prior defines */ - -extern int scsi_reset_provider(struct scsi_device *, int); +extern int scsi_ioctl_reset(struct scsi_device *, int __user *); struct scsi_eh_save { /* saved state */ |