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

[SCSI] scsi_debug: convert to use the data buffer accessors

Browse Source 
- remove the unnecessary map_single path.
  - convert to use the new accessors for the sg lists and the
    parameters.

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Acked-by: Douglas Gilbert <dougg@torque.net>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Boaz Harrosh
2007-09-07 06:50:20 +09:00
committed by James Bottomley
parent 48c23d3e37
commit c73961e563
1 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/scsi/scsi_debug.c
View File

@@ -329,7 +329,7 @@ int scsi_debug_queuecommand(struct scsi_cmnd * SCpnt, done_funct_t done)
if (done == NULL) if (done == NULL)
return 0; /* assume mid level reprocessing command */ return 0; /* assume mid level reprocessing command */
SCpnt->resid = 0; scsi_set_resid(SCpnt, 0);
if ((SCSI_DEBUG_OPT_NOISE & scsi_debug_opts) && cmd) { if ((SCSI_DEBUG_OPT_NOISE & scsi_debug_opts) && cmd) {
printk(KERN_INFO "scsi_debug: cmd "); printk(KERN_INFO "scsi_debug: cmd ");
for (k = 0, len = SCpnt->cmd_len; k < len; ++k) for (k = 0, len = SCpnt->cmd_len; k < len; ++k)
@@ -603,26 +603,16 @@ static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,
void * kaddr_off; void * kaddr_off;
struct scatterlist * sg; struct scatterlist * sg;
if (0 == scp->request_bufflen) if (0 == scsi_bufflen(scp))
return 0; return 0;
if (NULL == scp->request_buffer) if (NULL == scsi_sglist(scp))
return (DID_ERROR << 16); return (DID_ERROR << 16);
if (! ((scp->sc_data_direction == DMA_BIDIRECTIONAL) || if (! ((scp->sc_data_direction == DMA_BIDIRECTIONAL) ||
(scp->sc_data_direction == DMA_FROM_DEVICE))) (scp->sc_data_direction == DMA_FROM_DEVICE)))
return (DID_ERROR << 16); return (DID_ERROR << 16);
if (0 == scp->use_sg) {
req_len = scp->request_bufflen;
act_len = (req_len < arr_len) ? req_len : arr_len;
memcpy(scp->request_buffer, arr, act_len);
if (scp->resid)
scp->resid -= act_len;
else
scp->resid = req_len - act_len;
return 0;
}
active = 1; active = 1;
req_len = act_len = 0; req_len = act_len = 0;
scsi_for_each_sg(scp, sg, scp->use_sg, k) { scsi_for_each_sg(scp, sg, scsi_sg_count(scp), k) {
if (active) { if (active) {
kaddr = (unsigned char *) kaddr = (unsigned char *)
kmap_atomic(sg_page(sg), KM_USER0); kmap_atomic(sg_page(sg), KM_USER0);
@@ -640,10 +630,10 @@ static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,
} }
req_len += sg->length; req_len += sg->length;
} }
if (scp->resid) if (scsi_get_resid(scp))
scp->resid -= act_len; scsi_set_resid(scp, scsi_get_resid(scp) - act_len);
else else
scp->resid = req_len - act_len; scsi_set_resid(scp, req_len - act_len);
return 0; return 0;
} }
@@ -656,22 +646,15 @@ static int fetch_to_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,
void * kaddr_off; void * kaddr_off;
struct scatterlist * sg; struct scatterlist * sg;
if (0 == scp->request_bufflen) if (0 == scsi_bufflen(scp))
return 0; return 0;
if (NULL == scp->request_buffer) if (NULL == scsi_sglist(scp))
return -1; return -1;
if (! ((scp->sc_data_direction == DMA_BIDIRECTIONAL) || if (! ((scp->sc_data_direction == DMA_BIDIRECTIONAL) ||
(scp->sc_data_direction == DMA_TO_DEVICE))) (scp->sc_data_direction == DMA_TO_DEVICE)))
return -1; return -1;
if (0 == scp->use_sg) {
req_len = scp->request_bufflen;
len = (req_len < max_arr_len) ? req_len : max_arr_len;
memcpy(arr, scp->request_buffer, len);
return len;
}
sg = scsi_sglist(scp);
req_len = fin = 0; req_len = fin = 0;
for (k = 0; k < scp->use_sg; ++k, sg = sg_next(sg)) { scsi_for_each_sg(scp, sg, scsi_sg_count(scp), k) {
kaddr = (unsigned char *)kmap_atomic(sg_page(sg), KM_USER0); kaddr = (unsigned char *)kmap_atomic(sg_page(sg), KM_USER0);
if (NULL == kaddr) if (NULL == kaddr)
return -1; return -1;