lkml.org 
[lkml]   [2005]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] ide-disk oopses on boot
Why have you removed me from cc:?

On 8/10/05, Christoph Lameter <christoph@lameter.com> wrote:
> On Wed, 10 Aug 2005, Petr Vandrovec wrote:
>
> > > Yes that was discussed extensively by Andi and me and finally fixed by
> > > Kiran's patch in 2.6.13-rc6.
> >
> > By which patch? I hit it with post-2.6.13-rc6, exactly 2.6.13-rc6 with
> > checkin hash "commit 00dd1e433967872f3997a45d5adf35056fdf2f56". So if it is
> > supposed to be fixed in 2.6.13-rc6, it is not.
>
> Yes you are right there is one additional place where pcibus_to_node is
> used with the hwif that we did not cover. This better go into 2.6.13.

Yes.

> ---
> Fix ide-disk.c oops caused by hwif == NULL

This description is wrong, should be: hwif->pci_dev == NULL

> 1. Move hwif_to_node to ide.h
>
> 2. Use hwif_to_node in ide-disk.c
>
> Signed-off-by: Christoph Lameter <clameter@sgi.com>
>
> Index: linux-2.6/drivers/ide/ide-disk.c
> ===================================================================
> --- linux-2.6.orig/drivers/ide/ide-disk.c 2005-07-27 18:29:17.000000000 -0700
> +++ linux-2.6/drivers/ide/ide-disk.c 2005-08-09 19:55:03.000000000 -0700
> @@ -1220,7 +1220,7 @@
> goto failed;
>
> g = alloc_disk_node(1 << PARTN_BITS,
> - pcibus_to_node(drive->hwif->pci_dev->bus));
> + hwif_to_node(drive->hwif));
> if (!g)
> goto out_free_idkp;
>
> Index: linux-2.6/drivers/ide/ide-probe.c
> ===================================================================
> --- linux-2.6.orig/drivers/ide/ide-probe.c 2005-08-04 15:47:15.000000000 -0700
> +++ linux-2.6/drivers/ide/ide-probe.c 2005-08-09 19:46:50.000000000 -0700
> @@ -960,15 +960,6 @@
> }
> #endif /* MAX_HWIFS > 1 */
>
> -static inline int hwif_to_node(ide_hwif_t *hwif)
> -{
> - if (hwif->pci_dev)
> - return pcibus_to_node(hwif->pci_dev->bus);
> - else
> - /* Add ways to determine the node of other busses here */
> - return -1;
> -}
> -
> /*
> * init request queue
> */
> Index: linux-2.6/include/linux/ide.h
> ===================================================================
> --- linux-2.6.orig/include/linux/ide.h 2005-07-27 18:29:23.000000000 -0700
> +++ linux-2.6/include/linux/ide.h 2005-08-09 19:47:14.000000000 -0700
> @@ -1501,4 +1501,13 @@
> #define ide_id_has_flush_cache_ext(id) \
> (((id)->cfs_enable_2 & 0x2400) == 0x2400)
>
> +static inline int hwif_to_node(ide_hwif_t *hwif)
> +{
> + if (hwif->pci_dev)
> + return pcibus_to_node(hwif->pci_dev->bus);
> + else
> + /* Add ways to determine the node of other busses here */
> + return -1;
> +}
> +
> #endif /* _IDE_H */
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-08-10 10:07    [from the cache]
©2003-2011 Jasper Spaans