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

Commit 6fdea8db authored by Matthew Wilcox's avatar Matthew Wilcox Committed by James Bottomley
Browse files

[SCSI] ide-scsi: Close narrow race in release 



We were releasing the block devices before removing the host, so commands
could still be coming in which would cause a panic.  Just remove the
host before releasing the block devices to close this race.

Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 34f8f0d2

drivers/scsi/ide-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -671,6 +671,7 @@ static void ide_scsi_remove(ide_drive_t *drive) 
	struct ide_scsi_obj *scsi = scsihost_to_idescsi(scsihost);

	struct gendisk *g = scsi->disk;



	scsi_remove_host(scsihost);

	ide_proc_unregister_driver(drive, scsi->driver);



	ide_unregister_region(g);
@@ -679,7 +680,6 @@ static void ide_scsi_remove(ide_drive_t *drive) 
	g->private_data = NULL;

	put_disk(g);



	scsi_remove_host(scsihost);

	ide_scsi_put(scsi);

}