lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] st: convert cross_eof to use st_scsi_kern_execute

Browse Source 
This replaces st_do_scsi in cross_eof (SPACE) 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:25 +09:00
committed by James Bottomley
parent 15c920a6dc
commit 39ade4b1ac
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/scsi/st.c
View File

@@ -627,6 +627,7 @@ static int cross_eof(struct scsi_tape * STp, int forward)
{ {
struct st_request *SRpnt; struct st_request *SRpnt;
unsigned char cmd[MAX_COMMAND_SIZE]; unsigned char cmd[MAX_COMMAND_SIZE];
int ret;
cmd[0] = SPACE; cmd[0] = SPACE;
cmd[1] = 0x01; /* Space FileMarks */ cmd[1] = 0x01; /* Space FileMarks */
@@ -640,20 +641,26 @@ static int cross_eof(struct scsi_tape * STp, int forward)
DEBC(printk(ST_DEB_MSG "%s: Stepping over filemark %s.\n", DEBC(printk(ST_DEB_MSG "%s: Stepping over filemark %s.\n",
tape_name(STp), forward ? "forward" : "backward")); tape_name(STp), forward ? "forward" : "backward"));
SRpnt = st_do_scsi(NULL, STp, cmd, 0, DMA_NONE, SRpnt = st_allocate_request(STp);
STp->device->request_queue->rq_timeout,
MAX_RETRIES, 1);
if (!SRpnt) if (!SRpnt)
return (STp->buffer)->syscall_result; return STp->buffer->syscall_result;
st_release_request(SRpnt); ret = st_scsi_kern_execute(SRpnt, cmd, DMA_NONE, NULL, 0,
SRpnt = NULL; STp->device->request_queue->rq_timeout,
MAX_RETRIES);
if (ret)
goto out;
ret = STp->buffer->syscall_result;
if ((STp->buffer)->cmdstat.midlevel_result != 0) if ((STp->buffer)->cmdstat.midlevel_result != 0)
printk(KERN_ERR "%s: Stepping over filemark %s failed.\n", printk(KERN_ERR "%s: Stepping over filemark %s failed.\n",
tape_name(STp), forward ? "forward" : "backward"); tape_name(STp), forward ? "forward" : "backward");
return (STp->buffer)->syscall_result; out:
st_release_request(SRpnt);
return ret;
} }