diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-12-05 01:25:31 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-12-29 12:24:31 -0500 |
commit | ccc607f6d29def18a4c2a4aab31435a784754a64 (patch) | |
tree | ec762329be7bafae5f3e0f3cee78981beb60dfa2 | |
parent | 7a31ec3c1ff1ceeb3aebe25e13def5ac4edd5dc4 (diff) |
[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>
-rw-r--r-- | drivers/scsi/st.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 23780e99ca98..7f3f317ee6ca 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c | |||
@@ -2852,12 +2852,15 @@ static int st_int_ioctl(struct scsi_tape *STp, unsigned int cmd_in, unsigned lon | |||
2852 | return (-ENOSYS); | 2852 | return (-ENOSYS); |
2853 | } | 2853 | } |
2854 | 2854 | ||
2855 | SRpnt = st_do_scsi(NULL, STp, cmd, datalen, direction, | 2855 | SRpnt = st_allocate_request(STp); |
2856 | timeout, MAX_RETRIES, 1); | ||
2857 | if (!SRpnt) | 2856 | if (!SRpnt) |
2858 | return (STp->buffer)->syscall_result; | 2857 | return (STp->buffer)->syscall_result; |
2859 | 2858 | ||
2860 | ioctl_result = (STp->buffer)->syscall_result; | 2859 | ioctl_result = st_scsi_kern_execute(SRpnt, cmd, direction, |
2860 | STp->buffer->b_data, datalen, | ||
2861 | timeout, MAX_RETRIES); | ||
2862 | if (!ioctl_result) | ||
2863 | ioctl_result = (STp->buffer)->syscall_result; | ||
2861 | 2864 | ||
2862 | if (!ioctl_result) { /* SCSI command successful */ | 2865 | if (!ioctl_result) { /* SCSI command successful */ |
2863 | st_release_request(SRpnt); | 2866 | st_release_request(SRpnt); |