[BLOCK] add @uptodate to end_that_request_last() and @error to rq_end_io_fn()

add @uptodate argument to end_that_request_last() and @error
to rq_end_io_fn().  there's no generic way to pass error code
to request completion function, making generic error handling
of non-fs request difficult (rq->errors is driver-specific and
each driver uses it differently).  this patch adds @uptodate
to end_that_request_last() and @error to rq_end_io_fn().

for fs requests, this doesn't really matter, so just using the
same uptodate argument used in the last call to
end_that_request_first() should suffice.  imho, this can also
help the generic command-carrying request jens is working on.

Signed-off-by: tejun heo <htejun@gmail.com>
Signed-Off-By: Jens Axboe <axboe@suse.de>

3 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 4cb1f3ed9100..3c688ef54660 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -1046,7 +1046,7 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
 
         /* kill current request */
         blkdev_dequeue_request(req);
-        end_that_request_last(req);
+        end_that_request_last(req, 0);
         if (req->flags & REQ_SENSE)
                 kfree(scsi->pc->buffer);
         kfree(scsi->pc);
@@ -1056,7 +1056,7 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
         /* now nuke the drive queue */
         while ((req = elv_next_request(drive->queue))) {
                 blkdev_dequeue_request(req);
-                end_that_request_last(req);
+                end_that_request_last(req, 0);
         }
 
         HWGROUP(drive)->rq = NULL;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index a7f3f0c84db7..53551f1dfe21 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -791,7 +791,7 @@ static struct scsi_cmnd *scsi_end_request(struct scsi_cmnd *cmd, int uptodate,
         spin_lock_irqsave(q->queue_lock, flags);
         if (blk_rq_tagged(req))
                 blk_queue_end_tag(q, req);
-        end_that_request_last(req);
+        end_that_request_last(req, uptodate);
         spin_unlock_irqrestore(q->queue_lock, flags);
 
         /*
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 3d3ad7d1b779..d651150ee76d 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -748,7 +748,7 @@ static void sd_end_flush(request_queue_t *q, struct request *flush_rq)
                  * force journal abort of barriers
                  */
                 end_that_request_first(rq, -EOPNOTSUPP, rq->hard_nr_sectors);
-                end_that_request_last(rq);
+                end_that_request_last(rq, -EOPNOTSUPP);
         }
 }