2006-03-06 02:00:31

by Bastian Blank

[permalink] [raw]
Subject: [PATCH] s390 - fix match in ccw modalias

Hi folks

The attached patch fixes matching of devmodel in modaliases.

Martin: can you please push them through for 2.6.16? It breaks automatic
loading of any dasd module.

Bastian

--
The sight of death frightens them [Earthers].
-- Kras the Klingon, "Friday's Child", stardate 3497.2

Attachments:
(No filename) (0.00 B)
 signature.asc (197.00 B)
Digital signature Download all attachments

2006-03-06 07:46:41

by Cornelia Huck

[permalink] [raw]
Subject: Re: [PATCH] s390 - fix match in ccw modalias

On Mon, 6 Mar 2006 03:00:24 +0100
Bastian Blank <[email protected]> wrote:

> diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
> index be97caf..c164b23 100644
> --- a/scripts/mod/file2alias.c
> +++ b/scripts/mod/file2alias.c
> @@ -246,7 +246,7 @@ static int do_ccw_entry(const char *file
> id->cu_model);
> ADD(alias, "dt", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
> id->dev_type);
> - ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
> + ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_MODEL,
> id->dev_model);
> return 1;
> }

Patch makes sense to me.

> Martin: can you please push them through for 2.6.16? It breaks automatic
> loading of any dasd module.

I don't know whether Martin is operational this week, but I'd second an
inclusion into 2.6.16.

Cornelia

2006-03-06 21:28:50

by Martin Schwidefsky

[permalink] [raw]
Subject: Re: [PATCH] s390 - fix match in ccw modalias

On 3/6/06, Cornelia Huck <[email protected]> wrote:
> On Mon, 6 Mar 2006 03:00:24 +0100
> Bastian Blank <[email protected]> wrote:
>
> > diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
> > index be97caf..c164b23 100644
> > --- a/scripts/mod/file2alias.c
> > +++ b/scripts/mod/file2alias.c
> > @@ -246,7 +246,7 @@ static int do_ccw_entry(const char *file
> > id->cu_model);
> > ADD(alias, "dt", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
> > id->dev_type);
> > - ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
> > + ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_MODEL,
> > id->dev_model);
> > return 1;
> > }
>
> Patch makes sense to me.
>
> > Martin: can you please push them through for 2.6.16? It breaks automatic
> > loading of any dasd module.
>
> I don't know whether Martin is operational this week, but I'd second an
> inclusion into 2.6.16.

No really operational since I'm in Seattle. I'm watching lkml though. The patch
makes much sense to me as well and if Cornelia doesn't object the patch
should get integrated.

--
blue skies,
Martin