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

Commit 7e443312 authored by Alan Stern's avatar Alan Stern Committed by James Bottomley
Browse files

[SCSI] sd: fix medium-removal bug 



Commit 409f3499 (scsi/sd: remove big
kernel lock) introduced a bug in the sd_release routine.  Medium
removal should be allowed when the number of open file references
drops to 0, not when it becomes non-zero.

This patch (as1414) adjusts the test to fix the bug.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 0fb576d8

drivers/scsi/sd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -870,7 +870,7 @@ static int sd_release(struct gendisk *disk, fmode_t mode) 




	SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_release\n"));

	SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_release\n"));





	if (atomic_dec_return(&sdkp->openers) && sdev->removable) {

	if (atomic_dec_return(&sdkp->openers) == 0 && sdev->removable) {

		if (scsi_block_when_processing_errors(sdev))

		if (scsi_block_when_processing_errors(sdev))

			scsi_set_medium_removal(sdev, SCSI_REMOVAL_ALLOW);

			scsi_set_medium_removal(sdev, SCSI_REMOVAL_ALLOW);

	}

	}