diff options
| author | Bartlomiej Zolnierkiewicz | 2009-03-27 12:46:42 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2009-03-27 12:46:42 +0100 |
| commit | 1caf236dafb7291f9fdfe54b12dd945aec0dca03 (patch) | |
| tree | 0cd324f68b27ee15958739bca362941be380b3fb /drivers/ide/ide-cd.c | |
| parent | ide: make ide_special_rq() BUG() on unknown requests (diff) | |
| download | kernel-qcow2-linux-1caf236dafb7291f9fdfe54b12dd945aec0dca03.tar.gz kernel-qcow2-linux-1caf236dafb7291f9fdfe54b12dd945aec0dca03.tar.xz kernel-qcow2-linux-1caf236dafb7291f9fdfe54b12dd945aec0dca03.zip | |
ide: add ide_end_rq() (v2)
* Move request dequeuing from __ide_end_request() to ide_end_request().
* Rename __ide_end_request() to ide_end_rq() and export it.
* Fix ide_end_rq() to pass original blk_end_request() return value.
* ide_end_dequeued_request() is used only in cdrom_end_request()
so inline it there and then remove the function.
v2:
* Remove needless BUG_ON() while at it (start_request()'s one is enough).
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-cd.c')
| -rw-r--r-- | drivers/ide/ide-cd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index bb804ae57bc5..830fd570e760 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -272,8 +272,8 @@ static void cdrom_end_request(ide_drive_t *drive, int uptodate) * now end the failed request */ if (blk_fs_request(failed)) { - if (ide_end_dequeued_request(drive, failed, 0, - failed->hard_nr_sectors)) + if (ide_end_rq(drive, failed, 0, + failed->hard_nr_sectors << 9)) BUG(); } else { if (blk_end_request(failed, -EIO, |