From: Christoph Hellwig Date: Sat, 11 Oct 2014 14:25:31 +0000 (+0200) Subject: scsi: split scsi_nonblockable_ioctl X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~21^2~1^2~30 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=906d15fbd23c1267addab361063c1c8119992215;p=pandora-kernel.git scsi: split scsi_nonblockable_ioctl The calling conventions for this function are bad as it could return -ENODEV both for a device not currently online and a not recognized ioctl. Add a new scsi_ioctl_block_when_processing_errors function that wraps scsi_block_when_processing_errors with the a special case for the SG_SCSI_RESET ioctl command, and handle the SG_SCSI_RESET case itself in scsi_ioctl. All callers of scsi_ioctl now must call the above helper to check for the EH state, so that the ioctl handler itself doesn't have to. Reported-by: Robert Elliott Signed-off-by: Christoph Hellwig Reviewed-by: Martin K. Petersen Reviewed-by: Hannes Reinecke --- Reading git-diff-tree failed