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

[SCSI] st: move st_request initialization to st_allocate_request form st_do_scsi

Browse Source 
This moves st_request initialization code to st_allocate_request()
form st_do_scsi(). This is a preparation for making
st_allocate_request() usable for everyone, not only st_do_scsi().

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:20 +09:00
committed by James Bottomley
parent 5d2711c0ff
commit 4deba245d0
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/scsi/st.c
View File

@@ -451,9 +451,23 @@ static void st_sleep_done(void *data, char *sense, int result, int resid)
complete(SRpnt->waiting); complete(SRpnt->waiting);
} }
static struct st_request *st_allocate_request(void) static struct st_request *st_allocate_request(struct scsi_tape *stp)
{ {
return kzalloc(sizeof(struct st_request), GFP_KERNEL); struct st_request *streq;
streq = kzalloc(sizeof(*streq), GFP_KERNEL);
if (streq)
streq->stp = stp;
else {
DEBC(printk(KERN_ERR "%s: Can't get SCSI request.\n",
tape_name(stp)););
if (signal_pending(current))
stp->buffer->syscall_result = -EINTR;
else
stp->buffer->syscall_result = -EBUSY;
}
return streq;
} }
static void st_release_request(struct st_request *streq) static void st_release_request(struct st_request *streq)
@@ -481,18 +495,10 @@ st_do_scsi(struct st_request * SRpnt, struct scsi_tape * STp, unsigned char *cmd
return NULL; return NULL;
} }
if (SRpnt == NULL) { if (!SRpnt) {
SRpnt = st_allocate_request(); SRpnt = st_allocate_request(STp);
if (SRpnt == NULL) { if (!SRpnt)
DEBC( printk(KERN_ERR "%s: Can't get SCSI request.\n",
tape_name(STp)); );
if (signal_pending(current))
(STp->buffer)->syscall_result = (-EINTR);
else
(STp->buffer)->syscall_result = (-EBUSY);
return NULL; return NULL;
}
SRpnt->stp = STp;
} }
/* If async IO, set last_SRpnt. This ptr tells write_behind_check /* If async IO, set last_SRpnt. This ptr tells write_behind_check