public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
From: Andi Kleen <andi@firstfloor.org>
To: Alan Stern <stern@rowland.harvard.edu>
Cc: Andi Kleen <andi@firstfloor.org>,
	axboe@kernel.dk,
	James Bottomley <James.Bottomley@HansenPartnership.com>,
	Dave Jones <davej@redhat.com>,
	SCSI development list <linux-scsi@vger.kernel.org>,
	Kernel development list <linux-kernel@vger.kernel.org>,
	"Rafael J. Wysocki" <rjw@sisk.pl>,
	USB list <linux-usb@vger.kernel.org>
Subject: solved was Re: Linux 3.0 oopses when pulling a USB CDROM
Date: Thu, 7 Jul 2011 22:47:47 +0200	[thread overview]
Message-ID: <20110707204747.GL15637@one.firstfloor.org> (raw)
In-Reply-To: <Pine.LNX.4.44L0.1107021544550.16190-100000@netrider.rowland.org>

> Would you like to try this patch to see if it fixes the problem?  As I 
> said before, I'm not certain it's the best thing to do, but it worked 
> on my system.

Sorry for the delay. I can confirm this patch fixes the problem for me.
I did a few pulls and all performed fine. Thanks!

-Andi
> 
> Alan Stern
> 
> 
> 
> 
> Index: usb-3.0/drivers/scsi/scsi_lib.c
> ===================================================================
> --- usb-3.0.orig/drivers/scsi/scsi_lib.c
> +++ usb-3.0/drivers/scsi/scsi_lib.c
> @@ -1247,6 +1247,8 @@ int scsi_prep_fn(struct request_queue *q
>  	struct scsi_device *sdev = q->queuedata;
>  	int ret = BLKPREP_KILL;
>  
> +	if (!sdev)
> +		return ret;
>  	if (req->cmd_type == REQ_TYPE_BLOCK_PC)
>  		ret = scsi_setup_blk_pc_cmnd(sdev, req);
>  	return scsi_prep_return(q, req, ret);
> Index: usb-3.0/drivers/scsi/scsi_sysfs.c
> ===================================================================
> --- usb-3.0.orig/drivers/scsi/scsi_sysfs.c
> +++ usb-3.0/drivers/scsi/scsi_sysfs.c
> @@ -322,6 +322,8 @@ static void scsi_device_dev_release_user
>  		kfree(evt);
>  	}
>  
> +	/* Freeing the queue signals to block that we're done */
> +	scsi_free_queue(sdev->request_queue);
>  	blk_put_queue(sdev->request_queue);
>  	/* NULL queue means the device can't be used */
>  	sdev->request_queue = NULL;
> @@ -936,8 +938,6 @@ void __scsi_remove_device(struct scsi_de
>  	/* cause the request function to reject all I/O requests */
>  	sdev->request_queue->queuedata = NULL;
>  
> -	/* Freeing the queue signals to block that we're done */
> -	scsi_free_queue(sdev->request_queue);
>  	put_device(dev);
>  }
>  
> 
> 

-- 
ak@linux.intel.com -- Speaking for myself only.

  parent reply	other threads:[~2011-07-07 20:47 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-01 17:05 Linux 3.0 oopses when pulling a USB CDROM Andi Kleen
2011-07-01 18:14 ` Dave Jones
2011-07-01 18:32   ` Andi Kleen
2011-07-01 18:40     ` Dave Jones
2011-07-02 15:13     ` Christoph Fritz
2011-07-01 20:29   ` James Bottomley
2011-07-01 20:43     ` [PATCH] USB: fix regression occurring during device removal Alan Stern
2011-07-01 21:04       ` Andi Kleen
2011-07-01 21:04     ` Linux 3.0 oopses when pulling a USB CDROM Alan Stern
2011-07-01 21:13       ` James Bottomley
2011-07-02  2:03         ` Alan Stern
2011-07-02  6:08           ` Andi Kleen
2011-07-02 12:24             ` James Bottomley
2011-07-02 17:05               ` Andi Kleen
     [not found]                 ` <20110702170554.GJ23059-qrUzlfsMFqo/4alezvVtWx2eb7JE58TQ@public.gmane.org>
2011-07-02 17:09                   ` James Bottomley
2011-07-02 18:15                     ` Andi Kleen
2011-07-02 20:05                       ` Alan Stern
     [not found]                         ` <Pine.LNX.4.44L0.1107021559250.16190-100000-pYrvlCTfrz9XsRXLowluHWD2FQJk+8+b@public.gmane.org>
2011-07-03  1:16                           ` Andi Kleen
     [not found]                             ` <20110703011630.GA15637-qrUzlfsMFqo/4alezvVtWx2eb7JE58TQ@public.gmane.org>
2011-07-03 15:29                               ` Alan Stern
2011-07-03 16:06                                 ` Alan Stern
2011-07-02 17:37               ` Alan Stern
2011-07-02 18:11                 ` Andi Kleen
2011-07-02 19:59                   ` Alan Stern
2011-07-03  1:17                     ` Andi Kleen
2011-07-07 20:47                     ` Andi Kleen [this message]
2011-07-18 16:59                     ` Dan Williams
2011-07-18 18:00                       ` Andi Kleen
2011-07-20  9:58                       ` Jack Wang
2011-10-18 21:16                         ` Ankit Jain
2011-10-18 21:30                           ` James Bottomley
2011-10-21 13:26                             ` Hannes Reinecke
2011-07-03  9:14                 ` Dan Williams
2011-07-03 18:16                   ` Andi Kleen
2011-07-03 20:37                 ` Stefan Richter
2011-07-08 13:37                   ` Stefan Richter
2011-07-08 13:41                     ` Stefan Richter
     [not found]                 ` <Pine.LNX.4.44L0.1107021320180.14703-100000-pYrvlCTfrz9XsRXLowluHWD2FQJk+8+b@public.gmane.org>
2011-07-04 11:27                   ` Heiko Carstens
2011-07-04 16:04                     ` Alan Stern
2011-07-06  6:50                       ` Heiko Carstens
2011-07-12 18:49                       ` Jonathan McDowell
2011-07-02 12:38             ` Alan Stern
     [not found]               ` <Pine.LNX.4.44L0.1107020837220.11097-100000-pYrvlCTfrz9XsRXLowluHWD2FQJk+8+b@public.gmane.org>
2011-07-02 18:10                 ` Andi Kleen
     [not found]             ` <20110702060846.GH23059-qrUzlfsMFqo/4alezvVtWx2eb7JE58TQ@public.gmane.org>
2011-07-02 12:48               ` Rafael J. Wysocki
2011-07-02 17:06                 ` Andi Kleen
2011-07-01 19:20 ` James Bottomley
2011-07-01 19:33   ` James Bottomley
2011-07-01 19:45     ` James Bottomley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110707204747.GL15637@one.firstfloor.org \
    --to=andi@firstfloor.org \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=axboe@kernel.dk \
    --cc=davej@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=rjw@sisk.pl \
    --cc=stern@rowland.harvard.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox