Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b39da78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide-cd: fix REQ_QUIET tests in cdrom_decode_status

Fix up trivial conflicts in include/linux/blkdev.h
parents 2142baba 96c16743

drivers/ide/ide-cd.c

+4 −5
Original line number Diff line number Diff line
@@ -312,7 +312,6 @@ 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, do_end_request = 0;

	u8 quiet = rq->cmd_flags & REQ_QUIET;



	/* get the IDE error register */

	err = ide_read_error(drive);
@@ -347,7 +346,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) 
		} else {

			cdrom_saw_media_change(drive);



			if (blk_fs_request(rq) && !quiet)

			if (blk_fs_request(rq) && !blk_rq_quiet(rq))

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

					drive->name);

		}
@@ -382,7 +381,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)

		if (!blk_rq_quiet(rq))

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

		do_end_request = 1;

		break;
@@ -391,14 +390,14 @@ 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.

		 */

		if (!quiet)

		if (!blk_rq_quiet(rq))

			ide_dump_status(drive, "media error "

					"(bad sector)", stat);

		do_end_request = 1;

		break;

	case BLANK_CHECK:

		/* disk appears blank? */

		if (!quiet)

		if (!blk_rq_quiet(rq))

			ide_dump_status(drive, "media error (blank)",

					stat);

		do_end_request = 1;

include/linux/blkdev.h

+1 −0
Original line number Diff line number Diff line
@@ -601,6 +601,7 @@ enum { 
				 blk_failfast_driver(rq))

#define blk_rq_started(rq)	((rq)->cmd_flags & REQ_STARTED)

#define blk_rq_io_stat(rq)	((rq)->cmd_flags & REQ_IO_STAT)

#define blk_rq_quiet(rq)	((rq)->cmd_flags & REQ_QUIET)



#define blk_account_rq(rq)	(blk_rq_started(rq) && (blk_fs_request(rq) || blk_discard_rq(rq)))