mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
ide-cd: use common completion path for DMA requests in cdrom_newpc_intr()
Use the following facts: - rq->nr_sectors should now be always equal to (non-zero) rq->hard_nr_sectors for fs requests - REQ_TYPE_ATA_PC requests have never bio attached to them - rq->hard_nr_sectors == 0 for REQ_TYPE_ATA_PC requests - DMA is used only for fs, pc and REQ_TYPE_ATA_PC requests - 'uptodate' is ignored for pc requests ('rc == 0' case) and use the common completion path also for DMA requests. There should be no functional changes caused by this patch Cc: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
c7ec89994f
commit
4a3d8cf48c
1 changed files with 1 additions and 10 deletions
|
@ -657,16 +657,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
|
|||
if (dma) {
|
||||
if (dma_error)
|
||||
return ide_error(drive, "dma error", stat);
|
||||
if (blk_fs_request(rq)) {
|
||||
ide_complete_rq(drive, 0, rq->nr_sectors
|
||||
? (rq->nr_sectors << 9) : ide_rq_bytes(rq));
|
||||
return ide_stopped;
|
||||
} else if (rq->cmd_type == REQ_TYPE_ATA_PC && !rq->bio) {
|
||||
ide_complete_rq(drive, 0, 512);
|
||||
return ide_stopped;
|
||||
}
|
||||
if (blk_pc_request(rq) == 0 && uptodate == 0)
|
||||
rq->cmd_flags |= REQ_FAILED;
|
||||
uptodate = 1;
|
||||
goto out_end;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue