Re: [PATCH] scsi_remove_device locking

[Matthew Wilcox <willy@debian.org>]

On Fri, Jul 02, 2004 at 03:18:50PM -0500, Brian King wrote:
>  {
> -	if (scsi_device_set_state(sdev, SDEV_CANCEL) != 0)
> +	struct Scsi_Host *shost = sdev->host;
> +	down(&shost->scan_mutex);
> +
> +	if (scsi_device_set_state(sdev, SDEV_CANCEL) != 0) {
> +		up(&shost->scan_mutex);
>  		return;
> +	}
>  
>  	class_device_unregister(&sdev->sdev_classdev);
>  	if (sdev->transport_classdev.class)
> @@ -537,6 +542,7 @@ void scsi_remove_device(struct scsi_devi
>  	if (sdev->host->transportt->cleanup)
>  		sdev->host->transportt->cleanup(sdev);
>  	put_device(&sdev->sdev_gendev);
> +	up(&shost->scan_mutex);
>  }

IMO, this would be better done as:

{
	struct Scsi_Host *shost = sdev->host;
	down(&shost->scan_mutex);

	if (scsi_device_set_state(sdev, SDEV_CANCEL) != 0)
		goto out;

...
 out:
	up(&shost->scan_mutex);
}


-- 
"Next the statesmen will invent cheap lies, putting the blame upon 
the nation that is attacked, and every man will be glad of those
conscience-soothing falsities, and will diligently study them, and refuse
to examine any refutations of them; and thus he will by and by convince 
himself that the war is just, and will thank God for the better sleep 
he enjoys after this process of grotesque self-deception." -- Mark Twain