[SCSI] st: convert st_int_ioctl to use st_scsi_kern_execute

This replaces st_do_scsi in st_int_ioctl with st_scsi_kern_execute.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Kai Makisara <Kai.Makisara@kolumbus.fi>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
FUJITA Tomonori 2008-12-05 15:25:31 +09:00 committed by James Bottomley
parent 7a31ec3c1f
commit ccc607f6d2

View File

@ -2852,12 +2852,15 @@ static int st_int_ioctl(struct scsi_tape *STp, unsigned int cmd_in, unsigned lon
return (-ENOSYS); return (-ENOSYS);
} }
SRpnt = st_do_scsi(NULL, STp, cmd, datalen, direction, SRpnt = st_allocate_request(STp);
timeout, MAX_RETRIES, 1);
if (!SRpnt) if (!SRpnt)
return (STp->buffer)->syscall_result; return (STp->buffer)->syscall_result;
ioctl_result = (STp->buffer)->syscall_result; ioctl_result = st_scsi_kern_execute(SRpnt, cmd, direction,
STp->buffer->b_data, datalen,
timeout, MAX_RETRIES);
if (!ioctl_result)
ioctl_result = (STp->buffer)->syscall_result;
if (!ioctl_result) { /* SCSI command successful */ if (!ioctl_result) { /* SCSI command successful */
st_release_request(SRpnt); st_release_request(SRpnt);