From a474b25944980fd55b05c91bb6c7788e8e551c99 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Fri, 5 Dec 2008 15:25:26 +0900 Subject: [PATCH] --- yaml --- r: 124662 b: refs/heads/master c: 212cd8bfe12bb115e7bc9e119fe1411451829afb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/st.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fae7d9bb4a51..bd86386f6e44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39ade4b1acb685127d73b53814850d9c92084c9e +refs/heads/master: 212cd8bfe12bb115e7bc9e119fe1411451829afb diff --git a/trunk/drivers/scsi/st.c b/trunk/drivers/scsi/st.c index 34630a611f61..708e9e90678f 100644 --- a/trunk/drivers/scsi/st.c +++ b/trunk/drivers/scsi/st.c @@ -1288,11 +1288,17 @@ static int st_flush(struct file *filp, fl_owner_t id) cmd[0] = WRITE_FILEMARKS; cmd[4] = 1 + STp->two_fm; - SRpnt = st_do_scsi(NULL, STp, cmd, 0, DMA_NONE, - STp->device->request_queue->rq_timeout, - MAX_WRITE_RETRIES, 1); + SRpnt = st_allocate_request(STp); if (!SRpnt) { - result = (STp->buffer)->syscall_result; + result = STp->buffer->syscall_result; + goto out; + } + + result = st_scsi_kern_execute(SRpnt, cmd, DMA_NONE, NULL, 0, + STp->device->request_queue->rq_timeout, + MAX_WRITE_RETRIES); + if (result) { + st_release_request(SRpnt); goto out; }