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

ide-cd: respect REQ_QUIET for fs requests in cdrom_decode_status()

Browse Source 
There should be no functional change resulting from this patch.

Suggested-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Borislav Petkov
2009-04-08 14:12:53 +02:00
committed by Bartlomiej Zolnierkiewicz
parent 1597cd8250
commit dfa4411cc3
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/ide/ide-cd.c
View File

@@ -312,6 +312,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct request *rq = hwif->rq; struct request *rq = hwif->rq;
int err, sense_key; int err, sense_key;
u8 quiet = rq->cmd_flags & REQ_QUIET;
/* get the IDE error register */ /* get the IDE error register */
err = ide_read_error(drive); err = ide_read_error(drive);
@@ -354,7 +355,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
* drive doesn't have that capability. * drive doesn't have that capability.
* cdrom_log_sense() knows this! * cdrom_log_sense() knows this!
*/ */
} else if (!(rq->cmd_flags & REQ_QUIET)) { } else if (!quiet) {
/* otherwise, print an error */ /* otherwise, print an error */
ide_dump_status(drive, "packet command error", stat); ide_dump_status(drive, "packet command error", stat);
} }
@@ -382,7 +383,8 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
cdrom_saw_media_change(drive); cdrom_saw_media_change(drive);
/* fail the request */ /* fail the request */
printk(KERN_ERR PFX "%s: tray open\n", if (!quiet)
printk(KERN_ERR PFX "%s: tray open\n",
drive->name); drive->name);
} else { } else {
if (ide_cd_breathe(drive, rq)) if (ide_cd_breathe(drive, rq))
@@ -405,19 +407,23 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
* No point in retrying after an illegal request or data * No point in retrying after an illegal request or data
* protect error. * protect error.
*/ */
ide_dump_status(drive, "command error", stat); if (!quiet)
ide_dump_status(drive, "command error", stat);
do_end_request = 1; do_end_request = 1;
} else if (sense_key == MEDIUM_ERROR) { } else if (sense_key == MEDIUM_ERROR) {
/* /*
* No point in re-trying a zillion times on a bad * No point in re-trying a zillion times on a bad
* sector. If we got here the error is not correctable. * sector. If we got here the error is not correctable.
*/ */
ide_dump_status(drive, "media error (bad sector)", if (!quiet)
stat); ide_dump_status(drive, "media error "
"(bad sector)", stat);
do_end_request = 1; do_end_request = 1;
} else if (sense_key == BLANK_CHECK) { } else if (sense_key == BLANK_CHECK) {
/* disk appears blank ?? */ /* disk appears blank ?? */
ide_dump_status(drive, "media error (blank)", stat); if (!quiet)
ide_dump_status(drive, "media error (blank)",
stat);
do_end_request = 1; do_end_request = 1;
} else if ((err & ~ATA_ABORTED) != 0) { } else if ((err & ~ATA_ABORTED) != 0) {
/* go to the default handler for other errors */ /* go to the default handler for other errors */