Merge branch 'block'
James Bottomley [Thu, 23 Dec 2010 05:29:40 +0000 (23:29 -0600)]
15 files changed:
1  2 
block/ioctl.c
drivers/md/md.c
drivers/scsi/scsi_lib.c
drivers/scsi/sd.c
fs/block_dev.c
fs/btrfs/volumes.c
fs/btrfs/volumes.h
fs/ext3/super.c
fs/ext4/super.c
fs/ocfs2/cluster/heartbeat.c
fs/reiserfs/journal.c
fs/splice.c
include/linux/fs.h
include/scsi/scsi.h
kernel/power/swap.c

diff --cc block/ioctl.c
Simple merge
diff --cc drivers/md/md.c
Simple merge
Simple merge
@@@ -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;
        }
  
diff --cc fs/block_dev.c
Simple merge
Simple merge
Simple merge
diff --cc fs/ext3/super.c
Simple merge
diff --cc fs/ext4/super.c
Simple merge
Simple merge
Simple merge
diff --cc fs/splice.c
Simple merge
Simple merge
Simple merge
Simple merge