Re: PR/39468 CVS commit: src/sys/dev

[Matthias Scheler <tron%NetBSD.org@localhost>]

The following reply was made to PR kern/39468; it has been noted by GNATS.

From: Matthias Scheler <tron%NetBSD.org@localhost>
To: "Greg A. Woods" <woods%planix.com@localhost>
Cc: NetBSD GNATS <gnats-bugs%NetBSD.org@localhost>
Subject: Re: PR/39468 CVS commit: src/sys/dev
Date: Wed, 10 Sep 2008 19:41:00 +0100

 --+QahgC5+KEYLbs62
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On Wed, Sep 10, 2008 at 02:18:45PM -0400, Greg A. Woods wrote:
 > >  Log Message:
 > >  Complete device_t/softc split for the ld(4) attachments. This should
 > >  prevent crashes while attaching a drive.
 > > =20
 > >  Patch supplied by Juan RP in PR kern/39468.
 >=20
 > From what I can tell this patch undid the following change, or at least
 > one small part of it:
 >=20
 >      src/sys/dev/ata/ld_ataraid.c
 >=20
 >      revision 1.26
 >      date: 2008/04/05 22:04:36;  author: cegger;  state: Exp;  lines: +6 -7
 >      branches:  1.26.2;  1.26.4;
 >      use aprint_*_dev and device_xname
 
 That was not part of the commit. Here is the output of the "rdiff"
 command mentioned in
 <http://mail-index.netbsd.org/source-changes/2008/09/09/msg210084.html>:
 
 Index: src/sys/dev/ata/ld_ataraid.c
 diff -c src/sys/dev/ata/ld_ataraid.c:1.28 src/sys/dev/ata/ld_ataraid.c:1.29
 *** src/sys/dev/ata/ld_ataraid.c:1.28  Sun Aug 24 09:19:03 2008
 --- src/sys/dev/ata/ld_ataraid.c       Tue Sep  9 12:45:39 2008
 ***************
 *** 1,4 ****
 ! /*   $NetBSD: ld_ataraid.c,v 1.28 2008/08/24 09:19:03 hannken Exp $  */
  =20
   /*
    * Copyright (c) 2003 Wasabi Systems, Inc.
 --- 1,4 ----
 ! /*   $NetBSD: ld_ataraid.c,v 1.29 2008/09/09 12:45:39 tron Exp $     */
  =20
   /*
    * Copyright (c) 2003 Wasabi Systems, Inc.
 ***************
 *** 45,51 ****
    */
  =20
   #include <sys/cdefs.h>
 ! __KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.28 2008/08/24 09:19:03 hannk=
 en Exp $");
  =20
   #include "rnd.h"
  =20
 --- 45,51 ----
    */
  =20
   #include <sys/cdefs.h>
 ! __KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.29 2008/09/09 12:45:39 tron =
 Exp $");
  =20
   #include "rnd.h"
  =20
 ***************
 *** 130,135 ****
 --- 130,137 ----
        char unklev[32];
        u_int i;
  =20
 +      ld->sc_dv =3D self;
 +=20
        if (ld_ataraid_initialized =3D=3D 0) {
                ld_ataraid_initialized =3D 1;
                pool_init(&ld_ataraid_cbufpl, sizeof(struct cbuf), 0,
 ***************
 *** 180,186 ****
            ata_raid_type_name(aai->aai_type), level);
  =20
        if (ld->sc_start =3D=3D NULL) {
 !              aprint_error_dev(&ld->sc_dv, "unsupported array type\n");
                return;
        }
  =20
 --- 182,188 ----
            ata_raid_type_name(aai->aai_type), level);
  =20
        if (ld->sc_start =3D=3D NULL) {
 !              aprint_error_dev(ld->sc_dv, "unsupported array type\n");
                return;
        }
  =20
 ***************
 *** 472,478 ****
                adi->adi_status &=3D ~ADI_S_ONLINE;
  =20
                printf("%s: error %d on component %d (%s)\n",
 !                  device_xname(&sc->sc_ld.sc_dv), bp->b_error, cbp->cb_comp,
                    device_xname(adi->adi_dev));
  =20
                /*
 --- 474,480 ----
                adi->adi_status &=3D ~ADI_S_ONLINE;
  =20
                printf("%s: error %d on component %d (%s)\n",
 !                  device_xname(sc->sc_ld.sc_dv), bp->b_error, cbp->cb_comp,
                    device_xname(adi->adi_dev));
  =20
                /*
 
 It looks to me like you have uncommitted changes in your source tree.
 Please resolve the conflicts carefully and submit the changes in a PR.
 
        Thanks in advance
 
 --=20
 Matthias Scheler                                  http://zhadum.org.uk/
 
 --+QahgC5+KEYLbs62
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (NetBSD)
 
 iD8DBQFIyBS8iYEmcnvdc3cRAuTgAJ9SS4S/iXI0FKD/UGbZy9cfsI+5ngCgo/B+
 8nVxTqLXZ4ogFGf6acJFoyE=
 =1BD9
 -----END PGP SIGNATURE-----
 
 --+QahgC5+KEYLbs62--