lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide: remove ->end_request method

Browse Source 
* Handle completion of private driver requests explicitly
  for ide_floppy and ide_tape media in ide_kill_rq().

* Remove no longer needed ->end_request method.

There should be no functional changes caused by this patch.

Acked-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2009-03-27 12:46:36 +01:00
parent 313afea7f2
commit 3ee38302ff
7 changed files with 7 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/ide/ide-io.c
View File

@@ -178,17 +178,17 @@ EXPORT_SYMBOL(ide_complete_rq);
void ide_kill_rq(ide_drive_t *drive, struct request *rq)
{
u8 drv_req = blk_special_request(rq) && rq->rq_disk;
u8 media = drive->media;
drive->failed_pc = NULL;
if (drive->media == ide_tape)
if ((media == ide_floppy && drv_req) || media == ide_tape)
rq->errors = IDE_DRV_ERROR_GENERAL;
if (blk_special_request(rq) && rq->rq_disk) {
struct ide_driver *drv;
drv = *(struct ide_driver **)rq->rq_disk->private_data;
drv->end_request(drive, 0, 0);
} else
if ((media == ide_floppy || media == ide_tape) && drv_req)
ide_complete_rq(drive, 0);
else
ide_end_request(drive, 0, 0);
}