diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-12-05 15:25:30 +0900 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-12-29 11:24:31 -0600 |
| commit | 7a31ec3c1ff1ceeb3aebe25e13def5ac4edd5dc4 (patch) | |
| tree | 7757b9481d35b996141d2577fafc8ab3f2c45700 /drivers/scsi | |
| parent | 18c87015741d931875038789957db55b00661f5b (diff) | |
| download | linux-3.10-7a31ec3c1ff1ceeb3aebe25e13def5ac4edd5dc4.tar.gz linux-3.10-7a31ec3c1ff1ceeb3aebe25e13def5ac4edd5dc4.tar.bz2 linux-3.10-7a31ec3c1ff1ceeb3aebe25e13def5ac4edd5dc4.zip | |
[SCSI] st: convert get_location to use st_scsi_kern_execute
This replaces st_do_scsi in get_location (READ_POSITION) 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>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/st.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 09d06bdd25d..23780e99ca9 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -3019,11 +3019,17 @@ static int get_location(struct scsi_tape *STp, unsigned int *block, int *partiti if (!logical && !STp->scsi2_logical) scmd[1] = 1; } - SRpnt = st_do_scsi(NULL, STp, scmd, 20, DMA_FROM_DEVICE, - STp->device->request_queue->rq_timeout, - MAX_READY_RETRIES, 1); + + SRpnt = st_allocate_request(STp); if (!SRpnt) - return (STp->buffer)->syscall_result; + return STp->buffer->syscall_result; + + result = st_scsi_kern_execute(SRpnt, scmd, DMA_FROM_DEVICE, + STp->buffer->b_data, 20, + STp->device->request_queue->rq_timeout, + MAX_READY_RETRIES); + if (result) + goto out; if ((STp->buffer)->syscall_result != 0 || (STp->device->scsi_level >= SCSI_2 && @@ -3051,6 +3057,7 @@ static int get_location(struct scsi_tape *STp, unsigned int *block, int *partiti DEBC(printk(ST_DEB_MSG "%s: Got tape pos. blk %d part %d.\n", name, *block, *partition)); } +out: st_release_request(SRpnt); SRpnt = NULL; |