Re: [PATCH] scsi_requeuest_fn

[Patrick Mansfield <patmans@us.ibm.com>]

On Sun, Apr 27, 2003 at 05:04:40PM +0200, Christoph Hellwig wrote:

> --- 1.84/drivers/scsi/scsi_lib.c	Mon Apr 21 10:17:33 2003
> +++ edited/drivers/scsi/scsi_lib.c	Sun Apr 27 14:19:35 2003
> @@ -1140,66 +1128,61 @@
>   *
>   * Lock status: IO request lock assumed to be held when called.
>   */
> -static void scsi_request_fn(request_queue_t *q)
> +static void scsi_request_fn(struct request_queue *q)
>  {
>  	struct scsi_device *sdev = q->queuedata;
>  	struct Scsi_Host *shost = sdev->host;
>  	struct scsi_cmnd *cmd;
>  	struct request *req;
> -	unsigned long flags;
>  
>  	/*
>  	 * To start with, we keep looping until the queue is empty, or until
>  	 * the host is no longer able to accept any more requests.
>  	 */

You might as well remove all or most of the comments, none of them add
much information, the comments might as well say "we are about to
loop" or "we are about to call scsi_dispatch_cmd".

> -		BUG_ON(!cmd);
> +		spin_unlock_irq(shost->host_lock);
> +
> +		cmd = req->special;
> +		if (unlikely(cmd == NULL)) {
> +			printk(KERN_CRIT "impossible request in %s.\n"
> +					 "please mail a stack trace to "
> +					 "linux-scsi@vger.kernel.org",
> +					 __FUNCTION__);
> +			BUG();
> +		}

The scsi_init_cmd_errh(cmd) will oops anyway if cmd == NULL, so just remove
the check.

Also - do you have a patch rollup somewhere (in case these recent
patches aren't applied soon)?

-- Patrick Mansfield