This patch converts "normal" parts of ide to use blk_end_request interfaces. Related 'uptodate' arguments are converted to 'error'. The conversion of 'uptodate' to 'error' is done only for the internal function, __ide_end_request(). ide_end_request() was not changed since it's exported and used by many ide drivers. With this patch, blkdev_dequeue_request() in __ide_end_request() is moved to blk_end_request, since blk_end_request takes care of dequeueing request like below: if (!list_empty(&rq->queuelist)) blkdev_dequeue_request(rq); In the case of ide, o 'dequeue' variable of __ide_end_request() is 1 only when the request is still linked to the queue (i.e. rq->queuelist is not empty) o 'dequeue' variable of __ide_end_request() is 0 only when the request has already been removed from the queue (i.e. rq->queuelist is empty) So blk_end_request can handle it correctly although ide always run thought the code above.
Unified · Split
| @@ -655,9 +655,9 @@ static void cdrom_end_request (ide_drive_t *drive, int uptodate) · 654 unmodified lines | ||
| 655 | 655 | BUG(); |
| 656 | 656 | } else { |
| 657 | 657 | spin_lock_irqsave(&ide_lock, flags); |
| 658 | − end_that_request_chunk(failed, 0, | |
| 659 | − failed->data_len); | |
| 660 | − end_that_request_last(failed, 0); | |
| 658 | + if (__blk_end_request(failed, -EIO, | |
| 659 | + failed->data_len)) | |
| 660 | + BUG(); | |
| 661 | 661 | spin_unlock_irqrestore(&ide_lock, flags); |
| 662 | 662 | } |
| 663 | 663 | } else |
| @@ -58,15 +58,19 @@ static int __ide_end_request(ide_drive_t *drive, struct request *rq, · 57 unmodified lines | ||
| 58 | 58 | int uptodate, unsigned int nr_bytes, int dequeue) |
| 59 | 59 | { |
| 60 | 60 | int ret = 1; |
| 61 | + int error = 0; | |
| 62 | + | |
| 63 | + if (uptodate <= 0) | |
| 64 | + error = uptodate ? uptodate : -EIO; | |
| 61 | 65 | |
| 62 | 66 | /* |
| 63 | 67 | * if failfast is set on a request, override number of sectors and |
| 64 | 68 | * complete the whole request right now |
| 65 | 69 | */ |
| 66 | − if (blk_noretry_request(rq) && end_io_error(uptodate)) | |
| 70 | + if (blk_noretry_request(rq) && error) | |
| 67 | 71 | nr_bytes = rq->hard_nr_sectors << 9; |
| 68 | 72 | |
| 69 | − if (!blk_fs_request(rq) && end_io_error(uptodate) && !rq->errors) | |
| 73 | + if (!blk_fs_request(rq) && error && !rq->errors) | |
| 70 | 74 | rq->errors = -EIO; |
| 71 | 75 | |
| 72 | 76 | /* |
| @@ -78,14 +82,9 @@ static int __ide_end_request(ide_drive_t *drive, struct request *rq, · 5 unmodified lines | ||
| 78 | 82 | ide_dma_on(drive); |
| 79 | 83 | } |
| 80 | 84 | |
| 81 | − if (!end_that_request_chunk(rq, uptodate, nr_bytes)) { | |
| 82 | − add_disk_randomness(rq->rq_disk); | |
| 83 | − if (dequeue) { | |
| 84 | − if (!list_empty(&rq->queuelist)) | |
| 85 | − blkdev_dequeue_request(rq); | |
| 85 | + if (!__blk_end_request(rq, error, nr_bytes)) { | |
| 86 | + if (dequeue) | |
| 86 | 87 | HWGROUP(drive)->rq = NULL; |
| 87 | − } | |
| 88 | − end_that_request_last(rq, uptodate); | |
| 89 | 88 | ret = 0; |
| 90 | 89 | } |
| 91 | 90 | |
| @@ -290,9 +289,9 @@ static void ide_complete_pm_request (ide_drive_t *drive, struct request *rq) · 198 unmodified lines | ||
| 290 | 289 | drive->blocked = 0; |
| 291 | 290 | blk_start_queue(drive->queue); |
| 292 | 291 | } |
| 293 | − blkdev_dequeue_request(rq); | |
| 294 | 292 | HWGROUP(drive)->rq = NULL; |
| 295 | − end_that_request_last(rq, 1); | |
| 293 | + if (__blk_end_request(rq, 0, 0)) | |
| 294 | + BUG(); | |
| 296 | 295 | spin_unlock_irqrestore(&ide_lock, flags); |
| 297 | 296 | } |
| 298 | 297 | |
| @@ -387,10 +386,10 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err) · 88 unmodified lines | ||
| 387 | 386 | } |
| 388 | 387 | |
| 389 | 388 | spin_lock_irqsave(&ide_lock, flags); |
| 390 | − blkdev_dequeue_request(rq); | |
| 391 | 389 | HWGROUP(drive)->rq = NULL; |
| 392 | 390 | rq->errors = err; |
| 393 | − end_that_request_last(rq, !rq->errors); | |
| 391 | + if (__blk_end_request(rq, (rq->errors ? -EIO : 0), 0)) | |
| 392 | + BUG(); | |
| 394 | 393 | spin_unlock_irqrestore(&ide_lock, flags); |
| 395 | 394 | } |
| 396 | 395 | |