Commit e2f527b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "Two small fixes, both in upper layer drivers (scsi disk and cdrom).

  The sd one is fixing a commit changing revalidation that came from the
  block tree a while ago (5.10) and the sr one adds handling of a
  condition we didn't previously handle for manually removed media"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: sd: Call sd_revalidate_disk() for ioctl(BLKRRPART)
  scsi: sr: Return appropriate error code when disk is ejected
parents 7ce32ac6 d1b7f920

drivers/scsi/sd.c

+18 −4
Original line number Original line Diff line number Diff line
@@ -1387,6 +1387,22 @@ static void sd_uninit_command(struct scsi_cmnd *SCpnt) 
	}

	}

}

}





static bool sd_need_revalidate(struct block_device *bdev,

		struct scsi_disk *sdkp)

{

	if (sdkp->device->removable || sdkp->write_prot) {

		if (bdev_check_media_change(bdev))

			return true;

	}



	/*

	 * Force a full rescan after ioctl(BLKRRPART).  While the disk state has

	 * nothing to do with partitions, BLKRRPART is used to force a full

	 * revalidate after things like a format for historical reasons.

	 */

	return test_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);

}



/**

/**

 *	sd_open - open a scsi disk device

 *	sd_open - open a scsi disk device

 *	@bdev: Block device of the scsi disk to open

 *	@bdev: Block device of the scsi disk to open
@@ -1423,10 +1439,8 @@ static int sd_open(struct block_device *bdev, fmode_t mode) 
	if (!scsi_block_when_processing_errors(sdev))

	if (!scsi_block_when_processing_errors(sdev))

		goto error_out;

		goto error_out;





	if (sdev->removable || sdkp->write_prot) {

	if (sd_need_revalidate(bdev, sdkp))

		if (bdev_check_media_change(bdev))

		sd_revalidate_disk(bdev->bd_disk);

		sd_revalidate_disk(bdev->bd_disk);

	}





	/*

	/*

	 * If the drive is empty, just let the open fail.

	 * If the drive is empty, just let the open fail.

drivers/scsi/sr.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -220,6 +220,8 @@ static unsigned int sr_get_events(struct scsi_device *sdev) 
		return DISK_EVENT_EJECT_REQUEST;

		return DISK_EVENT_EJECT_REQUEST;

	else if (med->media_event_code == 2)

	else if (med->media_event_code == 2)

		return DISK_EVENT_MEDIA_CHANGE;

		return DISK_EVENT_MEDIA_CHANGE;

	else if (med->media_event_code == 3)

		return DISK_EVENT_EJECT_REQUEST;

	return 0;

	return 0;

}

}