From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Jan 2011 18:45:01 +0000 (-0800)
Subject: Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~4669
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=275220f0fcff1adf28a717076e00f575edf05fda;p=mirror_ubuntu-zesty-kernel.git

Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block: (43 commits)
  block: ensure that completion error gets properly traced
  blktrace: add missing probe argument to block_bio_complete
  block cfq: don't use atomic_t for cfq_group
  block cfq: don't use atomic_t for cfq_queue
  block: trace event block fix unassigned field
  block: add internal hd part table references
  block: fix accounting bug on cross partition merges
  kref: add kref_test_and_get
  bio-integrity: mark kintegrityd_wq highpri and CPU intensive
  block: make kblockd_workqueue smarter
  Revert "sd: implement sd_check_events()"
  block: Clean up exit_io_context() source code.
  Fix compile warnings due to missing removal of a 'ret' variable
  fs/block: type signature of major_to_index(int) to major_to_index(unsigned)
  block: convert !IS_ERR(p) && p to !IS_ERR_NOR_NULL(p)
  cfq-iosched: don't check cfqg in choose_service_tree()
  fs/splice: Pull buf->ops->confirm() from splice_from_pipe actors
  cdrom: export cdrom_check_events()
  sd: implement sd_check_events()
  sr: implement sr_check_events()
  ...
---

275220f0fcff1adf28a717076e00f575edf05fda
diff --cc drivers/scsi/sd.c
index 365024b0c407,8d488a9fef00..b65e65aa07eb
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@@ -1043,16 -1045,9 +1043,8 @@@ static int sd_media_changed(struct gend
  					      sshdr);
  	}
  
- 	/*
- 	 * Unable to test, unit probably not ready.   This usually
- 	 * means there is no disc in the drive.  Mark as changed,
- 	 * and we will figure it out later once the drive is
- 	 * available again.
- 	 */
- 	if (retval || (scsi_sense_valid(sshdr) &&
- 		       /* 0x3a is medium not present */
- 		       sshdr->asc == 0x3a)) {
+ 	if (retval) {
  		set_media_not_present(sdkp);
 -		retval = 1;
  		goto out;
  	}