Re: [PATCH] scsi-misc-2.5 remove scsi_device list_lock

[Christoph Hellwig <hch@infradead.org>]

> -		spin_lock_irqsave(&d->list_lock, flags);
> +		spin_lock_irqsave(&d->sdev_lock, flags);
>  		list_for_each_entry(cmd, &d->cmd_list, list) {
>  			if(cmd->serial_number == 0){

<snip>

> -	spin_lock_irqsave(&sdev->list_lock, flags);
> +	spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
>  	list_for_each_entry(scmd, &sdev->cmd_list, list) {


Oh, please, please use the lock consistantly.  Yes, I know that the
two are the same currently, but it might not be obvious to every reader
and queue_lock might change to something else in the future.

> -void scsi_put_command(struct scsi_cmnd *cmd)
> +void __scsi_put_command(struct scsi_cmnd *cmd)
>  {
>  	struct Scsi_Host *shost = cmd->device->host;
>  	unsigned long flags;
>  	
>  	/* serious error if the command hasn't come from a device list */
> -	spin_lock_irqsave(&cmd->device->list_lock, flags);
>  	BUG_ON(list_empty(&cmd->list));
>  	list_del_init(&cmd->list);
> -	spin_unlock(&cmd->device->list_lock);
> -	/* changing locks here, don't need to restore the irq state */
> -	spin_lock(&shost->free_list_lock);
> +	spin_lock_irqsave(&shost->free_list_lock, flags);

As this is always called under sdev_lock you don't need to care for
irq disabling here.