korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-15 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

blk_end_request: changing scsi (take 4)

Browse Source 
This patch converts scsi mid-layer to use blk_end_request interfaces.
Related 'uptodate' arguments are converted to 'error'.

As a result, the interface of internal function, scsi_end_request(),
is changed.

Cc: James Bottomley <James.Bottomley@SteelEye.com>
Cc: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Kiyoshi Ueda 2007-12-11 17:52:09 -05:00 committed by Jens Axboe
parent e3a04fe34a
commit 610d8b0c97
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/scsi/scsi_lib.c
View File

@ -634,7 +634,7 @@ void scsi_run_host_queues(struct Scsi_Host *shost)
* of upper level post-processing and scsi_io_completion). * of upper level post-processing and scsi_io_completion).
* *
* Arguments: cmd - command that is complete. * Arguments: cmd - command that is complete.
* uptodate - 1 if I/O indicates success, <= 0 for I/O error. * error - 0 if I/O indicates success, < 0 for I/O error.
* bytes - number of bytes of completed I/O * bytes - number of bytes of completed I/O
* requeue - indicates whether we should requeue leftovers. * requeue - indicates whether we should requeue leftovers.
* *
@ -649,26 +649,25 @@ void scsi_run_host_queues(struct Scsi_Host *shost)
* at some point during this call. * at some point during this call.
* Notes: If cmd was requeued, upon return it will be a stale pointer. * Notes: If cmd was requeued, upon return it will be a stale pointer.
*/ */
static struct scsi_cmnd *scsi_end_request(struct scsi_cmnd *cmd, int uptodate, static struct scsi_cmnd *scsi_end_request(struct scsi_cmnd *cmd, int error,
int bytes, int requeue) int bytes, int requeue)
{ {
struct request_queue *q = cmd->device->request_queue; struct request_queue *q = cmd->device->request_queue;
struct request *req = cmd->request; struct request *req = cmd->request;
unsigned long flags;
/* /*
* If there are blocks left over at the end, set up the command * If there are blocks left over at the end, set up the command
* to queue the remainder of them. * to queue the remainder of them.
*/ */
if (end_that_request_chunk(req, uptodate, bytes)) { if (blk_end_request(req, error, bytes)) {
int leftover = (req->hard_nr_sectors << 9); int leftover = (req->hard_nr_sectors << 9);
if (blk_pc_request(req)) if (blk_pc_request(req))
leftover = req->data_len; leftover = req->data_len;
/* kill remainder if no retrys */ /* kill remainder if no retrys */
if (!uptodate && blk_noretry_request(req)) if (error && blk_noretry_request(req))
end_that_request_chunk(req, 0, leftover); blk_end_request(req, error, leftover);
else { else {
if (requeue) { if (requeue) {
/* /*
@ -683,14 +682,6 @@ static struct scsi_cmnd *scsi_end_request(struct scsi_cmnd *cmd, int uptodate,
} }
} }
add_disk_randomness(req->rq_disk);
spin_lock_irqsave(q->queue_lock, flags);
if (blk_rq_tagged(req))
blk_queue_end_tag(q, req);
end_that_request_last(req, uptodate);
spin_unlock_irqrestore(q->queue_lock, flags);
/* /*
* This will goose the queue request function at the end, so we don't * This will goose the queue request function at the end, so we don't
* need to worry about launching another command. * need to worry about launching another command.
@ -987,7 +978,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
* are leftovers and there is some kind of error * are leftovers and there is some kind of error
* (result != 0), retry the rest. * (result != 0), retry the rest.
*/ */
if (scsi_end_request(cmd, 1, good_bytes, result == 0) == NULL) if (scsi_end_request(cmd, 0, good_bytes, result == 0) == NULL)
return; return;
/* good_bytes = 0, or (inclusive) there were leftovers and /* good_bytes = 0, or (inclusive) there were leftovers and
@ -1001,7 +992,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
* and quietly refuse further access. * and quietly refuse further access.
*/ */
cmd->device->changed = 1; cmd->device->changed = 1;
scsi_end_request(cmd, 0, this_count, 1); scsi_end_request(cmd, -EIO, this_count, 1);
return; return;
} else { } else {
/* Must have been a power glitch, or a /* Must have been a power glitch, or a
@ -1033,7 +1024,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
scsi_requeue_command(q, cmd); scsi_requeue_command(q, cmd);
return; return;
} else { } else {
scsi_end_request(cmd, 0, this_count, 1); scsi_end_request(cmd, -EIO, this_count, 1);
return; return;
} }
break; break;
@ -1061,7 +1052,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
"Device not ready", "Device not ready",
&sshdr); &sshdr);
scsi_end_request(cmd, 0, this_count, 1); scsi_end_request(cmd, -EIO, this_count, 1);
return; return;
case VOLUME_OVERFLOW: case VOLUME_OVERFLOW:
if (!(req->cmd_flags & REQ_QUIET)) { if (!(req->cmd_flags & REQ_QUIET)) {
@ -1071,7 +1062,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
scsi_print_sense("", cmd); scsi_print_sense("", cmd);
} }
/* See SSC3rXX or current. */ /* See SSC3rXX or current. */
scsi_end_request(cmd, 0, this_count, 1); scsi_end_request(cmd, -EIO, this_count, 1);
return; return;
default: default:
break; break;
@ -1092,7 +1083,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
scsi_print_sense("", cmd); scsi_print_sense("", cmd);
} }
} }
scsi_end_request(cmd, 0, this_count, !result); scsi_end_request(cmd, -EIO, this_count, !result);
} }
/* /*