Commit dfa4411c authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files

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



There should be no functional change resulting from this patch.

Suggested-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 1597cd82

drivers/ide/ide-cd.c

+12 −6
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) 
	ide_hwif_t *hwif = drive->hwif;

	struct request *rq = hwif->rq;

	int err, sense_key;

	u8 quiet = rq->cmd_flags & REQ_QUIET;



	/* get the IDE error register */

	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.

			 * cdrom_log_sense() knows this!

			 */

		} else if (!(rq->cmd_flags & REQ_QUIET)) {

		} else if (!quiet) {

			/* otherwise, print an error */

			ide_dump_status(drive, "packet command error", stat);

		}
@@ -382,6 +383,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) 
				cdrom_saw_media_change(drive);



				/* fail the request */

				if (!quiet)

					printk(KERN_ERR PFX "%s: tray open\n",

						drive->name);

			} else {
@@ -405,6 +407,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) 
			 * No point in retrying after an illegal request or data

			 * protect error.

			 */

			if (!quiet)

				ide_dump_status(drive, "command error", stat);

			do_end_request = 1;

		} else if (sense_key == MEDIUM_ERROR) {
@@ -412,12 +415,15 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) 
			 * No point in re-trying a zillion times on a bad

			 * sector. If we got here the error is not correctable.

			 */

			ide_dump_status(drive, "media error (bad sector)",

					stat);

			if (!quiet)

				ide_dump_status(drive, "media error "

						"(bad sector)",	stat);

			do_end_request = 1;

		} else if (sense_key == BLANK_CHECK) {

			/* 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;

		} else if ((err & ~ATA_ABORTED) != 0) {

			/* go to the default handler for other errors */