History

[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.

Tejun Heo committed 20 years ago

Commit 8ffdc651 parent 641000921 files · +42 −34Browse files

Unified · Split

21 files
  1. block/elevator.c +1 −1
  2. block/ll_rw_blk.c +15 −7
  3. drivers/block/DAC960.c +1 −1
  4. drivers/block/cciss.c +1 −1
  5. drivers/block/cpqarray.c +1 −1
  6. drivers/block/floppy.c +1 −1
  7. drivers/block/nbd.c +1 −1
  8. drivers/block/sx8.c +1 −1
  9. drivers/block/ub.c +1 −1
  10. drivers/block/viodasd.c +1 −1
  11. drivers/cdrom/cdu31a.c +1 −1
  12. drivers/ide/ide-cd.c +2 −2
  13. drivers/ide/ide-io.c +3 −3
  14. drivers/message/i2o/i2o_block.c +1 −1
  15. drivers/mmc/mmc_block.c +2 −2
  16. drivers/s390/block/dasd.c +1 −1
  17. drivers/s390/char/tape_block.c +1 −1
  18. drivers/scsi/ide-scsi.c +2 −2
  19. drivers/scsi/scsi_lib.c +1 −1
  20. drivers/scsi/sd.c +1 −1
  21. include/linux/blkdev.h +3 −3
block/elevator.c+1−1
@@ -498,7 +498,7 @@ struct request *elv_next_request(request_queue_t *q) · 497 unmodified lines
498 blkdev_dequeue_request(rq);498 blkdev_dequeue_request(rq);
499 rq->flags |= REQ_QUIET;499 rq->flags |= REQ_QUIET;
500 end_that_request_chunk(rq, 0, nr_bytes);500 end_that_request_chunk(rq, 0, nr_bytes);
501 end_that_request_last(rq);501 end_that_request_last(rq, 0);
502 } else {502 } else {
503 printk(KERN_ERR "%s: bad return=%d\n", __FUNCTION__,503 printk(KERN_ERR "%s: bad return=%d\n", __FUNCTION__,
504 ret);504 ret);
block/ll_rw_blk.c+15−7
@@ -344,7 +344,7 @@ EXPORT_SYMBOL(blk_queue_issue_flush_fn); · 343 unmodified lines
344/*344/*
345 * Cache flushing for ordered writes handling345 * Cache flushing for ordered writes handling
346 */346 */
347static void blk_pre_flush_end_io(struct request *flush_rq)347static void blk_pre_flush_end_io(struct request *flush_rq, int error)
348{348{
349 struct request *rq = flush_rq->end_io_data;349 struct request *rq = flush_rq->end_io_data;
350 request_queue_t *q = rq->q;350 request_queue_t *q = rq->q;
@@ -362,7 +362,7 @@ static void blk_pre_flush_end_io(struct request *flush_rq) · 11 unmodified lines
362 }362 }
363}363}
364 364
365static void blk_post_flush_end_io(struct request *flush_rq)365static void blk_post_flush_end_io(struct request *flush_rq, int error)
366{366{
367 struct request *rq = flush_rq->end_io_data;367 struct request *rq = flush_rq->end_io_data;
368 request_queue_t *q = rq->q;368 request_queue_t *q = rq->q;
@@ -2317,7 +2317,7 @@ EXPORT_SYMBOL(blk_rq_map_kern); · 1948 unmodified lines
2317 */2317 */
2318void blk_execute_rq_nowait(request_queue_t *q, struct gendisk *bd_disk,2318void blk_execute_rq_nowait(request_queue_t *q, struct gendisk *bd_disk,
2319 struct request *rq, int at_head,2319 struct request *rq, int at_head,
2320 void (*done)(struct request *))2320 rq_end_io_fn *done)
2321{2321{
2322 int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;2322 int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
2323 2323
@@ -2521,7 +2521,7 @@ EXPORT_SYMBOL(blk_put_request); · 197 unmodified lines
2521 * blk_end_sync_rq - executes a completion event on a request2521 * blk_end_sync_rq - executes a completion event on a request
2522 * @rq: request to complete2522 * @rq: request to complete
2523 */2523 */
2524void blk_end_sync_rq(struct request *rq)2524void blk_end_sync_rq(struct request *rq, int error)
2525{2525{
2526 struct completion *waiting = rq->waiting;2526 struct completion *waiting = rq->waiting;
2527 2527
@@ -3183,9 +3183,17 @@ EXPORT_SYMBOL(end_that_request_chunk); · 655 unmodified lines
3183/*3183/*
3184 * queue lock must be held3184 * queue lock must be held
3185 */3185 */
3186void end_that_request_last(struct request *req)3186void end_that_request_last(struct request *req, int uptodate)
3187{3187{
3188 struct gendisk *disk = req->rq_disk;3188 struct gendisk *disk = req->rq_disk;
3189 int error;
3190
3191 /*
3192 * extend uptodate bool to allow < 0 value to be direct io error
3193 */
3194 error = 0;
3195 if (end_io_error(uptodate))
3196 error = !uptodate ? -EIO : uptodate;
3189 3197
3190 if (unlikely(laptop_mode) && blk_fs_request(req))3198 if (unlikely(laptop_mode) && blk_fs_request(req))
3191 laptop_io_completion();3199 laptop_io_completion();
@@ -3200,7 +3208,7 @@ void end_that_request_last(struct request *req) · 8 unmodified lines
3200 disk->in_flight--;3208 disk->in_flight--;
3201 }3209 }
3202 if (req->end_io)3210 if (req->end_io)
3203 req->end_io(req);3211 req->end_io(req, error);
3204 else3212 else
3205 __blk_put_request(req->q, req);3213 __blk_put_request(req->q, req);
3206}3214}
@@ -3212,7 +3220,7 @@ void end_request(struct request *req, int uptodate) · 5 unmodified lines
3212 if (!end_that_request_first(req, uptodate, req->hard_cur_sectors)) {3220 if (!end_that_request_first(req, uptodate, req->hard_cur_sectors)) {
3213 add_disk_randomness(req->rq_disk);3221 add_disk_randomness(req->rq_disk);
3214 blkdev_dequeue_request(req);3222 blkdev_dequeue_request(req);
3215 end_that_request_last(req);3223 end_that_request_last(req, uptodate);
3216 }3224 }
3217}3225}
3218 3226
drivers/block/DAC960.c+1−1
@@ -3471,7 +3471,7 @@ static inline boolean DAC960_ProcessCompletedRequest(DAC960_Command_T *Command, · 3470 unmodified lines
3471 3471
3472 if (!end_that_request_first(Request, UpToDate, Command->BlockCount)) {3472 if (!end_that_request_first(Request, UpToDate, Command->BlockCount)) {
3473 3473
3474 end_that_request_last(Request);3474 end_that_request_last(Request, UpToDate);
3475 3475
3476 if (Command->Completion) {3476 if (Command->Completion) {
3477 complete(Command->Completion);3477 complete(Command->Completion);
drivers/block/cciss.c+1−1
@@ -2310,7 +2310,7 @@ static inline void complete_command( ctlr_info_t *h, CommandList_struct *cmd, · 2309 unmodified lines
2310 printk("Done with %p\n", cmd->rq);2310 printk("Done with %p\n", cmd->rq);
2311#endif /* CCISS_DEBUG */ 2311#endif /* CCISS_DEBUG */
2312 2312
2313 end_that_request_last(cmd->rq);2313 end_that_request_last(cmd->rq, status ? 1 : -EIO);
2314 cmd_free(h,cmd,1);2314 cmd_free(h,cmd,1);
2315}2315}
2316 2316
drivers/block/cpqarray.c+1−1
@@ -1036,7 +1036,7 @@ static inline void complete_command(cmdlist_t *cmd, int timeout) · 1035 unmodified lines
1036 complete_buffers(cmd->rq->bio, ok);1036 complete_buffers(cmd->rq->bio, ok);
1037 1037
1038 DBGPX(printk("Done with %p\n", cmd->rq););1038 DBGPX(printk("Done with %p\n", cmd->rq););
1039 end_that_request_last(cmd->rq);1039 end_that_request_last(cmd->rq, ok ? 1 : -EIO);
1040}1040}
1041 1041
1042/*1042/*
drivers/block/floppy.c+1−1
@@ -2301,7 +2301,7 @@ static void floppy_end_request(struct request *req, int uptodate) · 2300 unmodified lines
2301 add_disk_randomness(req->rq_disk);2301 add_disk_randomness(req->rq_disk);
2302 floppy_off((long)req->rq_disk->private_data);2302 floppy_off((long)req->rq_disk->private_data);
2303 blkdev_dequeue_request(req);2303 blkdev_dequeue_request(req);
2304 end_that_request_last(req);2304 end_that_request_last(req, uptodate);
2305 2305
2306 /* We're done with the request */2306 /* We're done with the request */
2307 current_req = NULL;2307 current_req = NULL;
drivers/block/nbd.c+1−1
@@ -136,7 +136,7 @@ static void nbd_end_request(struct request *req) · 135 unmodified lines
136 136
137 spin_lock_irqsave(q->queue_lock, flags);137 spin_lock_irqsave(q->queue_lock, flags);
138 if (!end_that_request_first(req, uptodate, req->nr_sectors)) {138 if (!end_that_request_first(req, uptodate, req->nr_sectors)) {
139 end_that_request_last(req);139 end_that_request_last(req, uptodate);
140 }140 }
141 spin_unlock_irqrestore(q->queue_lock, flags);141 spin_unlock_irqrestore(q->queue_lock, flags);
142}142}
drivers/block/sx8.c+1−1
@@ -770,7 +770,7 @@ static inline void carm_end_request_queued(struct carm_host *host, · 769 unmodified lines
770 rc = end_that_request_first(req, uptodate, req->hard_nr_sectors);770 rc = end_that_request_first(req, uptodate, req->hard_nr_sectors);
771 assert(rc == 0);771 assert(rc == 0);
772 772
773 end_that_request_last(req);773 end_that_request_last(req, uptodate);
774 774
775 rc = carm_put_request(host, crq);775 rc = carm_put_request(host, crq);
776 assert(rc == 0);776 assert(rc == 0);
drivers/block/ub.c+1−1
@@ -951,7 +951,7 @@ static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd) · 950 unmodified lines
951static void ub_end_rq(struct request *rq, int uptodate)951static void ub_end_rq(struct request *rq, int uptodate)
952{952{
953 end_that_request_first(rq, uptodate, rq->hard_nr_sectors);953 end_that_request_first(rq, uptodate, rq->hard_nr_sectors);
954 end_that_request_last(rq);954 end_that_request_last(rq, uptodate);
955}955}
956 956
957static int ub_rw_cmd_retry(struct ub_dev *sc, struct ub_lun *lun,957static int ub_rw_cmd_retry(struct ub_dev *sc, struct ub_lun *lun,
drivers/block/viodasd.c+1−1
@@ -305,7 +305,7 @@ static void viodasd_end_request(struct request *req, int uptodate, · 304 unmodified lines
305 if (end_that_request_first(req, uptodate, num_sectors))305 if (end_that_request_first(req, uptodate, num_sectors))
306 return;306 return;
307 add_disk_randomness(req->rq_disk);307 add_disk_randomness(req->rq_disk);
308 end_that_request_last(req);308 end_that_request_last(req, uptodate);
309}309}
310 310
311/*311/*
drivers/cdrom/cdu31a.c+1−1
@@ -1402,7 +1402,7 @@ static void do_cdu31a_request(request_queue_t * q) · 1401 unmodified lines
1402 if (!end_that_request_first(req, 1, nblock)) {1402 if (!end_that_request_first(req, 1, nblock)) {
1403 spin_lock_irq(q->queue_lock);1403 spin_lock_irq(q->queue_lock);
1404 blkdev_dequeue_request(req);1404 blkdev_dequeue_request(req);
1405 end_that_request_last(req);1405 end_that_request_last(req, 1);
1406 spin_unlock_irq(q->queue_lock);1406 spin_unlock_irq(q->queue_lock);
1407 }1407 }
1408 continue;1408 continue;
drivers/ide/ide-cd.c+2−2
@@ -614,7 +614,7 @@ static void cdrom_end_request (ide_drive_t *drive, int uptodate) · 613 unmodified lines
614 */614 */
615 spin_lock_irqsave(&ide_lock, flags);615 spin_lock_irqsave(&ide_lock, flags);
616 end_that_request_chunk(failed, 0, failed->data_len);616 end_that_request_chunk(failed, 0, failed->data_len);
617 end_that_request_last(failed);617 end_that_request_last(failed, 0);
618 spin_unlock_irqrestore(&ide_lock, flags);618 spin_unlock_irqrestore(&ide_lock, flags);
619 }619 }
620 620
@@ -1735,7 +1735,7 @@ end_request: · 1114 unmodified lines
1735 1735
1736 spin_lock_irqsave(&ide_lock, flags);1736 spin_lock_irqsave(&ide_lock, flags);
1737 blkdev_dequeue_request(rq);1737 blkdev_dequeue_request(rq);
1738 end_that_request_last(rq);1738 end_that_request_last(rq, 1);
1739 HWGROUP(drive)->rq = NULL;1739 HWGROUP(drive)->rq = NULL;
1740 spin_unlock_irqrestore(&ide_lock, flags);1740 spin_unlock_irqrestore(&ide_lock, flags);
1741 return ide_stopped;1741 return ide_stopped;
drivers/ide/ide-io.c+3−3
@@ -89,7 +89,7 @@ int __ide_end_request(ide_drive_t *drive, struct request *rq, int uptodate, · 88 unmodified lines
89 89
90 blkdev_dequeue_request(rq);90 blkdev_dequeue_request(rq);
91 HWGROUP(drive)->rq = NULL;91 HWGROUP(drive)->rq = NULL;
92 end_that_request_last(rq);92 end_that_request_last(rq, uptodate);
93 ret = 0;93 ret = 0;
94 }94 }
95 return ret;95 return ret;
@@ -247,7 +247,7 @@ static void ide_complete_pm_request (ide_drive_t *drive, struct request *rq) · 151 unmodified lines
247 }247 }
248 blkdev_dequeue_request(rq);248 blkdev_dequeue_request(rq);
249 HWGROUP(drive)->rq = NULL;249 HWGROUP(drive)->rq = NULL;
250 end_that_request_last(rq);250 end_that_request_last(rq, 1);
251 spin_unlock_irqrestore(&ide_lock, flags);251 spin_unlock_irqrestore(&ide_lock, flags);
252}252}
253 253
@@ -379,7 +379,7 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err) · 125 unmodified lines
379 blkdev_dequeue_request(rq);379 blkdev_dequeue_request(rq);
380 HWGROUP(drive)->rq = NULL;380 HWGROUP(drive)->rq = NULL;
381 rq->errors = err;381 rq->errors = err;
382 end_that_request_last(rq);382 end_that_request_last(rq, !rq->errors);
383 spin_unlock_irqrestore(&ide_lock, flags);383 spin_unlock_irqrestore(&ide_lock, flags);
384}384}
385 385
drivers/message/i2o/i2o_block.c+1−1
@@ -466,7 +466,7 @@ static void i2o_block_end_request(struct request *req, int uptodate, · 465 unmodified lines
466 466
467 spin_lock_irqsave(q->queue_lock, flags);467 spin_lock_irqsave(q->queue_lock, flags);
468 468
469 end_that_request_last(req);469 end_that_request_last(req, uptodate);
470 470
471 if (likely(dev)) {471 if (likely(dev)) {
472 dev->open_queue_depth--;472 dev->open_queue_depth--;
drivers/mmc/mmc_block.c+2−2
@@ -263,7 +263,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) · 262 unmodified lines
263 */263 */
264 add_disk_randomness(req->rq_disk);264 add_disk_randomness(req->rq_disk);
265 blkdev_dequeue_request(req);265 blkdev_dequeue_request(req);
266 end_that_request_last(req);266 end_that_request_last(req, 1);
267 }267 }
268 spin_unlock_irq(&md->lock);268 spin_unlock_irq(&md->lock);
269 } while (ret);269 } while (ret);
@@ -289,7 +289,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) · 19 unmodified lines
289 289
290 add_disk_randomness(req->rq_disk);290 add_disk_randomness(req->rq_disk);
291 blkdev_dequeue_request(req);291 blkdev_dequeue_request(req);
292 end_that_request_last(req);292 end_that_request_last(req, 0);
293 spin_unlock_irq(&md->lock);293 spin_unlock_irq(&md->lock);
294 294
295 return 0;295 return 0;
drivers/s390/block/dasd.c+1−1
@@ -1035,7 +1035,7 @@ dasd_end_request(struct request *req, int uptodate) · 1034 unmodified lines
1035 if (end_that_request_first(req, uptodate, req->hard_nr_sectors))1035 if (end_that_request_first(req, uptodate, req->hard_nr_sectors))
1036 BUG();1036 BUG();
1037 add_disk_randomness(req->rq_disk);1037 add_disk_randomness(req->rq_disk);
1038 end_that_request_last(req);1038 end_that_request_last(req, uptodate);
1039}1039}
1040 1040
1041/*1041/*
drivers/s390/char/tape_block.c+1−1
@@ -78,7 +78,7 @@ tapeblock_end_request(struct request *req, int uptodate) · 77 unmodified lines
78{78{
79 if (end_that_request_first(req, uptodate, req->hard_nr_sectors))79 if (end_that_request_first(req, uptodate, req->hard_nr_sectors))
80 BUG();80 BUG();
81 end_that_request_last(req);81 end_that_request_last(req, uptodate);
82}82}
83 83
84static void84static void
drivers/scsi/ide-scsi.c+2−2
@@ -1046,7 +1046,7 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd) · 1045 unmodified lines
1046 1046
1047 /* kill current request */1047 /* kill current request */
1048 blkdev_dequeue_request(req);1048 blkdev_dequeue_request(req);
1049 end_that_request_last(req);1049 end_that_request_last(req, 0);
1050 if (req->flags & REQ_SENSE)1050 if (req->flags & REQ_SENSE)
1051 kfree(scsi->pc->buffer);1051 kfree(scsi->pc->buffer);
1052 kfree(scsi->pc);1052 kfree(scsi->pc);
@@ -1056,7 +1056,7 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd) · 3 unmodified lines
1056 /* now nuke the drive queue */1056 /* now nuke the drive queue */
1057 while ((req = elv_next_request(drive->queue))) {1057 while ((req = elv_next_request(drive->queue))) {
1058 blkdev_dequeue_request(req);1058 blkdev_dequeue_request(req);
1059 end_that_request_last(req);1059 end_that_request_last(req, 0);
1060 }1060 }
1061 1061
1062 HWGROUP(drive)->rq = NULL;1062 HWGROUP(drive)->rq = NULL;
drivers/scsi/scsi_lib.c+1−1
@@ -791,7 +791,7 @@ static struct scsi_cmnd *scsi_end_request(struct scsi_cmnd *cmd, int uptodate, · 790 unmodified lines
791 spin_lock_irqsave(q->queue_lock, flags);791 spin_lock_irqsave(q->queue_lock, flags);
792 if (blk_rq_tagged(req))792 if (blk_rq_tagged(req))
793 blk_queue_end_tag(q, req);793 blk_queue_end_tag(q, req);
794 end_that_request_last(req);794 end_that_request_last(req, uptodate);
795 spin_unlock_irqrestore(q->queue_lock, flags);795 spin_unlock_irqrestore(q->queue_lock, flags);
796 796
797 /*797 /*
drivers/scsi/sd.c+1−1
@@ -748,7 +748,7 @@ static void sd_end_flush(request_queue_t *q, struct request *flush_rq) · 747 unmodified lines
748 * force journal abort of barriers748 * force journal abort of barriers
749 */749 */
750 end_that_request_first(rq, -EOPNOTSUPP, rq->hard_nr_sectors);750 end_that_request_first(rq, -EOPNOTSUPP, rq->hard_nr_sectors);
751 end_that_request_last(rq);751 end_that_request_last(rq, -EOPNOTSUPP);
752 }752 }
753}753}
754 754
include/linux/blkdev.h+3−3
@@ -102,7 +102,7 @@ void copy_io_context(struct io_context **pdst, struct io_context **psrc); · 101 unmodified lines
102void swap_io_context(struct io_context **ioc1, struct io_context **ioc2);102void swap_io_context(struct io_context **ioc1, struct io_context **ioc2);
103 103
104struct request;104struct request;
105typedef void (rq_end_io_fn)(struct request *);105typedef void (rq_end_io_fn)(struct request *, int);
106 106
107struct request_list {107struct request_list {
108 int count[2];108 int count[2];
@@ -560,7 +560,7 @@ extern void register_disk(struct gendisk *dev); · 451 unmodified lines
560extern void generic_make_request(struct bio *bio);560extern void generic_make_request(struct bio *bio);
561extern void blk_put_request(struct request *);561extern void blk_put_request(struct request *);
562extern void __blk_put_request(request_queue_t *, struct request *);562extern void __blk_put_request(request_queue_t *, struct request *);
563extern void blk_end_sync_rq(struct request *rq);563extern void blk_end_sync_rq(struct request *rq, int error);
564extern void blk_attempt_remerge(request_queue_t *, struct request *);564extern void blk_attempt_remerge(request_queue_t *, struct request *);
565extern struct request *blk_get_request(request_queue_t *, int, gfp_t);565extern struct request *blk_get_request(request_queue_t *, int, gfp_t);
566extern void blk_insert_request(request_queue_t *, struct request *, int, void *);566extern void blk_insert_request(request_queue_t *, struct request *, int, void *);
@@ -614,7 +614,7 @@ static inline void blk_run_address_space(struct address_space *mapping) · 47 unmodified lines
614 */614 */
615extern int end_that_request_first(struct request *, int, int);615extern int end_that_request_first(struct request *, int, int);
616extern int end_that_request_chunk(struct request *, int, int);616extern int end_that_request_chunk(struct request *, int, int);
617extern void end_that_request_last(struct request *);617extern void end_that_request_last(struct request *, int);
618extern void end_request(struct request *req, int uptodate);618extern void end_request(struct request *req, int uptodate);
619 619
620/*620/*

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t