RE: [PATCH 2/2] Convert megaraid to use pci_driver shutdown metho d

RE: [PATCH 2/2] Convert megaraid to use pci_driver shutdown metho d

[Kolli, Neela Syam]

Patch looks good.  Thanks for the patch.

Thanks,
Neela Syam Kolli.

-----Original Message-----
From: Russell King [mailto:rmk+lkml@arm.linux.org.uk] 
Sent: Sunday, October 16, 2005 4:33 PM
To: Linux Kernel List; Andrew Morton; Greg KH; Neela.Kolli@engenio.com
Subject: Re: [PATCH 2/2] Convert megaraid to use pci_driver shutdown method

Convert megaraid to use pci_driver's shutdown method rather than
the generic device_driver shutdown method.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/drivers/scsi/megaraid/megaraid_mbox.c
b/drivers/scsi/megaraid/megaraid_mbox.c
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -76,7 +76,7 @@ static void megaraid_exit(void);
 
 static int megaraid_probe_one(struct pci_dev*, const struct pci_device_id
*);
 static void megaraid_detach_one(struct pci_dev *);
-static void megaraid_mbox_shutdown(struct device *);
+static void megaraid_mbox_shutdown(struct pci_dev *);
 
 static int megaraid_io_attach(adapter_t *);
 static void megaraid_io_detach(adapter_t *);
@@ -369,9 +369,7 @@ static struct pci_driver megaraid_pci_dr
 	.id_table	= pci_id_table_g,
 	.probe		= megaraid_probe_one,
 	.remove		= __devexit_p(megaraid_detach_one),
-	.driver		= {
-		.shutdown	= megaraid_mbox_shutdown,
-	}
+	.shutdown	= megaraid_mbox_shutdown,
 };
 
 
@@ -673,9 +671,9 @@ megaraid_detach_one(struct pci_dev *pdev
  * Shutdown notification, perform flush cache
  */
 static void
-megaraid_mbox_shutdown(struct device *device)
+megaraid_mbox_shutdown(struct pci_dev *pdev)
 {
-	adapter_t		*adapter =
pci_get_drvdata(to_pci_dev(device));
+	adapter_t		*adapter = pci_get_drvdata(pdev);
 	static int		counter;
 
 	if (!adapter) {

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core

Re: [PATCH 2/2] Convert megaraid to use pci_driver shutdown metho d

[Christoph Hellwig]

On Mon, Oct 17, 2005 at 09:26:12AM -0400, Kolli, Neela Syam wrote:
> Patch looks good.  Thanks for the patch.

another 2.6.14 candidate, without it we'd easily get corruption
on shutdown when the root filesystem is on megaraid.

> From: Russell King [mailto:rmk+lkml@arm.linux.org.uk] 
> Sent: Sunday, October 16, 2005 4:33 PM
> To: Linux Kernel List; Andrew Morton; Greg KH; Neela.Kolli@engenio.com
> Subject: Re: [PATCH 2/2] Convert megaraid to use pci_driver shutdown method
> 
> Convert megaraid to use pci_driver's shutdown method rather than
> the generic device_driver shutdown method.
> 
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> 
> diff --git a/drivers/scsi/megaraid/megaraid_mbox.c
> b/drivers/scsi/megaraid/megaraid_mbox.c
> --- a/drivers/scsi/megaraid/megaraid_mbox.c
> +++ b/drivers/scsi/megaraid/megaraid_mbox.c
> @@ -76,7 +76,7 @@ static void megaraid_exit(void);
>  
>  static int megaraid_probe_one(struct pci_dev*, const struct pci_device_id
> *);
>  static void megaraid_detach_one(struct pci_dev *);
> -static void megaraid_mbox_shutdown(struct device *);
> +static void megaraid_mbox_shutdown(struct pci_dev *);
>  
>  static int megaraid_io_attach(adapter_t *);
>  static void megaraid_io_detach(adapter_t *);
> @@ -369,9 +369,7 @@ static struct pci_driver megaraid_pci_dr
>  	.id_table	= pci_id_table_g,
>  	.probe		= megaraid_probe_one,
>  	.remove		= __devexit_p(megaraid_detach_one),
> -	.driver		= {
> -		.shutdown	= megaraid_mbox_shutdown,
> -	}
> +	.shutdown	= megaraid_mbox_shutdown,
>  };
>  
>  
> @@ -673,9 +671,9 @@ megaraid_detach_one(struct pci_dev *pdev
>   * Shutdown notification, perform flush cache
>   */
>  static void
> -megaraid_mbox_shutdown(struct device *device)
> +megaraid_mbox_shutdown(struct pci_dev *pdev)
>  {
> -	adapter_t		*adapter =
> pci_get_drvdata(to_pci_dev(device));
> +	adapter_t		*adapter = pci_get_drvdata(pdev);
>  	static int		counter;
>  
>  	if (!adapter) {
> 

Re: [PATCH 2/2] Convert megaraid to use pci_driver shutdown metho d

[Greg KH]

On Mon, Oct 17, 2005 at 02:42:28PM +0100, Christoph Hellwig wrote:
> On Mon, Oct 17, 2005 at 09:26:12AM -0400, Kolli, Neela Syam wrote:
> > Patch looks good.  Thanks for the patch.
> 
> another 2.6.14 candidate, without it we'd easily get corruption
> on shutdown when the root filesystem is on megaraid.

No, the megaraid shutdown method will be called, only if that member
isn't set will the pci shutdown call be made.  So this should be safe
today, right?

thanks,

greg k-h

Re: [PATCH 2/2] Convert megaraid to use pci_driver shutdown metho d

[Christoph Hellwig]

On Mon, Oct 17, 2005 at 10:08:55AM -0700, Greg KH wrote:
> On Mon, Oct 17, 2005 at 02:42:28PM +0100, Christoph Hellwig wrote:
> > On Mon, Oct 17, 2005 at 09:26:12AM -0400, Kolli, Neela Syam wrote:
> > > Patch looks good.  Thanks for the patch.
> > 
> > another 2.6.14 candidate, without it we'd easily get corruption
> > on shutdown when the root filesystem is on megaraid.
> 
> No, the megaraid shutdown method will be called, only if that member
> isn't set will the pci shutdown call be made.  So this should be safe
> today, right?

If that actually got fixed it's fine indeed.

Re: [PATCH 2/2] Convert megaraid to use pci_driver shutdown metho d

[Greg KH]

On Mon, Oct 17, 2005 at 06:10:25PM +0100, Christoph Hellwig wrote:
> On Mon, Oct 17, 2005 at 10:08:55AM -0700, Greg KH wrote:
> > On Mon, Oct 17, 2005 at 02:42:28PM +0100, Christoph Hellwig wrote:
> > > On Mon, Oct 17, 2005 at 09:26:12AM -0400, Kolli, Neela Syam wrote:
> > > > Patch looks good.  Thanks for the patch.
> > > 
> > > another 2.6.14 candidate, without it we'd easily get corruption
> > > on shutdown when the root filesystem is on megaraid.
> > 
> > No, the megaraid shutdown method will be called, only if that member
> > isn't set will the pci shutdown call be made.  So this should be safe
> > today, right?
> 
> If that actually got fixed it's fine indeed.

The code today is:

        /* FIXME, once all of the existing PCI drivers have been fixed to set
         * the pci shutdown function, this test can go away. */
        if (!drv->driver.shutdown)
                drv->driver.shutdown = pci_device_shutdown;

so we should be fine.

thanks,

greg k-h