From e86d9c0e4d93dfb2e01b1383d2f4ba217a28ad1f Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Fri, 5 Dec 2008 15:25:23 +0900 Subject: [PATCH] --- yaml --- r: 124659 b: refs/heads/master c: 3c0bf16c63a6ef69c9b3e90591e6179deacfa8f7 h: refs/heads/master i: 124657: 2aeeebd29e41f12f56fdc7e899428775e416f088 124655: b4c6b883f26a8e1ffaea74b1297d0235c5a7099b v: v3 --- [refs] | 2 +- trunk/drivers/scsi/st.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4c4b68e609e1..33131beb2455 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0944a721ba5c2535b615f06afd3aaa2f18c69cb9 +refs/heads/master: 3c0bf16c63a6ef69c9b3e90591e6179deacfa8f7 diff --git a/trunk/drivers/scsi/st.c b/trunk/drivers/scsi/st.c index c200496e90fe..c60972ffcfc3 100644 --- a/trunk/drivers/scsi/st.c +++ b/trunk/drivers/scsi/st.c @@ -3088,10 +3088,14 @@ static int set_location(struct scsi_tape *STp, unsigned int block, int partition timeout = STp->device->request_queue->rq_timeout; } - SRpnt = st_do_scsi(NULL, STp, scmd, 0, DMA_NONE, - 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_NONE, NULL, 0, + timeout, MAX_READY_RETRIES); + if (result) + goto out; STps->drv_block = STps->drv_file = (-1); STps->eof = ST_NOEOF; @@ -3116,7 +3120,7 @@ static int set_location(struct scsi_tape *STp, unsigned int block, int partition STps->drv_block = STps->drv_file = 0; result = 0; } - +out: st_release_request(SRpnt); SRpnt = NULL;