Date: Wed, 12 Aug 1998 10:23:07 +0930 From: Greg Lehey <grog@lemis.com> To: "Eugene M. Kim" <gene@nttlabs.com>, FreeBSD SCSI Mailing List <freebsd-scsi@FreeBSD.ORG> Subject: Re: CAM patch won't apply to -current Message-ID: <19980812102307.S22754@freebie.lemis.com> In-Reply-To: <Pine.BSF.3.96.980811100414.12739B-100000@seera.nttlabs.com>; from Eugene M. Kim on Tue, Aug 11, 1998 at 10:10:35AM -0700 References: <Pine.BSF.3.96.980811100414.12739B-100000@seera.nttlabs.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tuesday, 11 August 1998 at 10:10:35 -0700, Eugene M. Kim wrote:
> Hello,
>
> Yesterday I decided to try CAM on my -current system. I fetched the
> CAM patch and tried to apply it, but the it wouldn't patch because the
> interface to dsopen() in sys/kern/subr_diskslice.c had been changed
> recently. (dsopen() now expects one more argument.)
>
> Apparently the CAM patch would not work until it is also revised
> accordingly. So my question is: when would the new patch be released?
I sent in a patch for this a couple of days ago. It's relatively
trivial, so here it is:
--- wd.c.old-perforce Fri Jul 17 05:46:19 1998
+++ wd.c Sun Aug 9 12:22:02 1998
@@ -1469,7 +1469,7 @@
label.d_ncylinders = du->dk_dd.d_ncylinders;
label.d_secpercyl = du->dk_dd.d_secpercyl;
label.d_secperunit = du->dk_dd.d_secperunit;
- error = dsopen("wd", dev, fmt, &du->dk_slices, &label, wdstrategy1,
+ error = dsopen("wd", dev, fmt, 0, &du->dk_slices, &label, wdstrategy1,
(ds_setgeom_t *)NULL, &wd_cdevsw, &wd_cdevsw);
}
du->dk_flags &= ~DKFL_LABELLING;
--- scsi_da.c.old-perforce Mon Aug 3 14:51:23 1998
+++ scsi_da.c Sun Aug 9 12:18:42 1998
@@ -310,7 +310,7 @@
}
/* Initialize slice tables. */
- error = dsopen("da", dev, fmt, &softc->dk_slices, &label,
+ error = dsopen("da", dev, fmt, 0, &softc->dk_slices, &label,
dastrategy, (ds_setgeom_t *)NULL,
&da_cdevsw, &da_cdevsw);
Greg
--
See complete headers for address and phone numbers
finger grog@lemis.com for PGP public key
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-scsi" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19980812102307.S22754>