d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove bdevsw arg from dsopen();

Browse Source 
Forgotten by:	julian
Reviewed by:	bde
This commit is contained in:
Poul-Henning Kamp 1998-08-23 20:16:35 +00:00
parent 2386a98ddd
commit be18fc123b
10 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/vn/vn.c
View File

@ -38,7 +38,7 @@
* from: Utah Hdr: vn.c 1.13 94/04/02 * from: Utah Hdr: vn.c 1.13 94/04/02
* *
* from: @(#)vn.c 8.6 (Berkeley) 4/1/94 * from: @(#)vn.c 8.6 (Berkeley) 4/1/94
* $Id: vn.c,v 1.67 1998/07/30 15:16:04 bde Exp $ * $Id: vn.c,v 1.68 1998/08/19 10:50:32 sos Exp $
*/ */
/* /*
@ -234,7 +234,7 @@ vnopen(dev_t dev, int flags, int mode, struct proc *p)
return (dsopen("vn", dev, mode, 0, &vn->sc_slices, return (dsopen("vn", dev, mode, 0, &vn->sc_slices,
&label, vnstrategy, (ds_setgeom_t *)NULL, &label, vnstrategy, (ds_setgeom_t *)NULL,
&vn_cdevsw, &vn_cdevsw)); &vn_cdevsw));
} }
if (dkslice(dev) != WHOLE_DISK_SLICE || if (dkslice(dev) != WHOLE_DISK_SLICE ||
dkpart(dev) != RAW_PART || dkpart(dev) != RAW_PART ||

4
sys/i386/isa/wd.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91 * from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* $Id: wd.c,v 1.172 1998/07/13 08:23:01 julian Exp $ * $Id: wd.c,v 1.173 1998/07/30 15:16:04 bde Exp $
*/ */
/* TODO: /* TODO:
@ -1501,7 +1501,7 @@ wdopen(dev_t dev, int flags, int fmt, struct proc *p)
label.d_secpercyl = du->dk_dd.d_secpercyl; label.d_secpercyl = du->dk_dd.d_secpercyl;
label.d_secperunit = du->dk_dd.d_secperunit; label.d_secperunit = du->dk_dd.d_secperunit;
error = dsopen("wd", dev, fmt, 0, &du->dk_slices, &label, wdstrategy1, error = dsopen("wd", dev, fmt, 0, &du->dk_slices, &label, wdstrategy1,
(ds_setgeom_t *)NULL, &wd_cdevsw, &wd_cdevsw); (ds_setgeom_t *)NULL, &wd_cdevsw);
} }
du->dk_flags &= ~DKFL_LABELLING; du->dk_flags &= ~DKFL_LABELLING;
wdsleep(du->dk_ctrlr, "wdopn2"); wdsleep(du->dk_ctrlr, "wdopn2");

5
sys/i386/isa/wfd.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: wfd.c,v 1.13 1998/07/13 09:53:03 bde Exp $ * $Id: wfd.c,v 1.14 1998/07/30 15:16:05 bde Exp $
*/ */
/* /*
@ -375,8 +375,7 @@ int wfdopen (dev_t dev, int flags, int fmt, struct proc *p)
/* Initialize slice tables. */ /* Initialize slice tables. */
errcode = dsopen("wfd", dev, fmt, 0, &t->dk_slices, &label, errcode = dsopen("wfd", dev, fmt, 0, &t->dk_slices, &label,
wfdstrategy1, (ds_setgeom_t *)NULL, &wfd_cdevsw, wfdstrategy1, (ds_setgeom_t *)NULL, &wfd_cdevsw);
&wfd_cdevsw);
if (errcode != 0) if (errcode != 0)
return errcode; return errcode;

13
sys/kern/subr_diskslice.c
View File

@ -43,7 +43,7 @@
* from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $ * from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
* $Id: subr_diskslice.c,v 1.56 1998/07/30 15:16:05 bde Exp $ * $Id: subr_diskslice.c,v 1.57 1998/08/13 08:09:07 dfr Exp $
*/ */
#include "opt_devfs.h" #include "opt_devfs.h"
@ -512,7 +512,7 @@ dsioctl(dname, dev, cmd, data, flags, sspp, strat, setgeom)
ssp->dss_slices[WHOLE_DISK_SLICE].ds_copenmask ssp->dss_slices[WHOLE_DISK_SLICE].ds_copenmask
& (1 << RAW_PART) ? S_IFCHR : S_IFBLK, & (1 << RAW_PART) ? S_IFCHR : S_IFBLK,
ssp->dss_oflags, sspp, lp, strat, setgeom, ssp->dss_oflags, sspp, lp, strat, setgeom,
ssp->dss_bdevsw, ssp->dss_cdevsw); ssp->dss_cdevsw);
if (error != 0) { if (error != 0) {
free(lp, M_DEVBUF); free(lp, M_DEVBUF);
*sspp = ssp; *sspp = ssp;
@ -534,7 +534,6 @@ dsioctl(dname, dev, cmd, data, flags, sspp, strat, setgeom)
slice), slice),
S_IFBLK, ssp->dss_oflags, sspp, S_IFBLK, ssp->dss_oflags, sspp,
lp, strat, setgeom, lp, strat, setgeom,
ssp->dss_bdevsw,
ssp->dss_cdevsw); ssp->dss_cdevsw);
if (error != 0) { if (error != 0) {
/* XXX should free devfs toks. */ /* XXX should free devfs toks. */
@ -553,7 +552,6 @@ dsioctl(dname, dev, cmd, data, flags, sspp, strat, setgeom)
slice), slice),
S_IFCHR, ssp->dss_oflags, sspp, S_IFCHR, ssp->dss_oflags, sspp,
lp, strat, setgeom, lp, strat, setgeom,
ssp->dss_bdevsw,
ssp->dss_cdevsw); ssp->dss_cdevsw);
if (error != 0) { if (error != 0) {
/* XXX should free devfs toks. */ /* XXX should free devfs toks. */
@ -654,7 +652,6 @@ dsmakeslicestruct(nslices, lp)
ssp = malloc(offsetof(struct diskslices, dss_slices) + ssp = malloc(offsetof(struct diskslices, dss_slices) +
nslices * sizeof *sp, M_DEVBUF, M_WAITOK); nslices * sizeof *sp, M_DEVBUF, M_WAITOK);
ssp->dss_bdevsw = NULL;
ssp->dss_cdevsw = NULL; ssp->dss_cdevsw = NULL;
ssp->dss_first_bsd_slice = COMPATIBILITY_SLICE; ssp->dss_first_bsd_slice = COMPATIBILITY_SLICE;
ssp->dss_nslices = nslices; ssp->dss_nslices = nslices;
@ -700,7 +697,7 @@ dsname(dname, unit, slice, part, partname)
* strategy routine must be special to allow activity. * strategy routine must be special to allow activity.
*/ */
int int
dsopen(dname, dev, mode, flags, sspp, lp, strat, setgeom, bdevsw, cdevsw) dsopen(dname, dev, mode, flags, sspp, lp, strat, setgeom, cdevsw)
char *dname; char *dname;
dev_t dev; dev_t dev;
int mode; int mode;
@ -709,7 +706,6 @@ dsopen(dname, dev, mode, flags, sspp, lp, strat, setgeom, bdevsw, cdevsw)
struct disklabel *lp; struct disklabel *lp;
d_strategy_t *strat; d_strategy_t *strat;
ds_setgeom_t *setgeom; ds_setgeom_t *setgeom;
struct cdevsw *bdevsw;
struct cdevsw *cdevsw; struct cdevsw *cdevsw;
{ {
struct dkbad *btp; struct dkbad *btp;
@ -760,7 +756,6 @@ dsopen(dname, dev, mode, flags, sspp, lp, strat, setgeom, bdevsw, cdevsw)
ssp = *sspp; ssp = *sspp;
ssp->dss_oflags = flags; ssp->dss_oflags = flags;
#ifdef DEVFS #ifdef DEVFS
ssp->dss_bdevsw = bdevsw;
ssp->dss_cdevsw = cdevsw; ssp->dss_cdevsw = cdevsw;
#endif #endif
@ -1170,7 +1165,7 @@ set_ds_labeldevs_unaliased(dname, dev, ssp)
} else { } else {
mynor = minor(dkmodpart(dev, part)); mynor = minor(dkmodpart(dev, part));
sp->ds_bdevs[part] = sp->ds_bdevs[part] =
devfs_add_devswf(ssp->dss_bdevsw, mynor, DV_BLK, devfs_add_devswf(ssp->dss_cdevsw, mynor, DV_BLK,
UID_ROOT, GID_OPERATOR, 0640, UID_ROOT, GID_OPERATOR, 0640,
"%s%s", sname, partname); "%s%s", sname, partname);
sp->ds_cdevs[part] = sp->ds_cdevs[part] =

4
sys/pc98/pc98/wd.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91 * from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* $Id: wd.c,v 1.59 1998/07/13 09:29:25 kato Exp $ * $Id: wd.c,v 1.60 1998/07/30 15:16:05 bde Exp $
*/ */
/* TODO: /* TODO:
@ -1619,7 +1619,7 @@ wdopen(dev_t dev, int flags, int fmt, struct proc *p)
label.d_secpercyl = du->dk_dd.d_secpercyl; label.d_secpercyl = du->dk_dd.d_secpercyl;
label.d_secperunit = du->dk_dd.d_secperunit; label.d_secperunit = du->dk_dd.d_secperunit;
error = dsopen("wd", dev, fmt, 0, &du->dk_slices, &label, wdstrategy1, error = dsopen("wd", dev, fmt, 0, &du->dk_slices, &label, wdstrategy1,
(ds_setgeom_t *)NULL, &wd_cdevsw, &wd_cdevsw); (ds_setgeom_t *)NULL, &wd_cdevsw);
} }
du->dk_flags &= ~DKFL_LABELLING; du->dk_flags &= ~DKFL_LABELLING;
wdsleep(du->dk_ctrlr, "wdopn2"); wdsleep(du->dk_ctrlr, "wdopn2");

5
sys/pc98/pc98/wfd.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: wfd.c,v 1.13 1998/07/13 09:53:03 bde Exp $ * $Id: wfd.c,v 1.14 1998/07/30 15:16:05 bde Exp $
*/ */
/* /*
@ -375,8 +375,7 @@ int wfdopen (dev_t dev, int flags, int fmt, struct proc *p)
/* Initialize slice tables. */ /* Initialize slice tables. */
errcode = dsopen("wfd", dev, fmt, 0, &t->dk_slices, &label, errcode = dsopen("wfd", dev, fmt, 0, &t->dk_slices, &label,
wfdstrategy1, (ds_setgeom_t *)NULL, &wfd_cdevsw, wfdstrategy1, (ds_setgeom_t *)NULL, &wfd_cdevsw);
&wfd_cdevsw);
if (errcode != 0) if (errcode != 0)
return errcode; return errcode;

4
sys/scsi/cd.c
View File

@ -14,7 +14,7 @@
* *
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
* *
* $Id: cd.c,v 1.97 1998/07/30 17:05:10 bde Exp $ * $Id: cd.c,v 1.98 1998/08/17 19:09:36 bde Exp $
*/ */
#include "opt_bounce.h" #include "opt_bounce.h"
@ -340,7 +340,7 @@ cd_open(dev_t dev, int flags, int fmt, struct proc *p,
/* Initialize slice tables. */ /* Initialize slice tables. */
errcode = dsopen("cd", dev, fmt, DSO_NOLABELS | DSO_ONESLICE, errcode = dsopen("cd", dev, fmt, DSO_NOLABELS | DSO_ONESLICE,
&cd->dk_slices, &label, cdstrategy1, &cd->dk_slices, &label, cdstrategy1,
(ds_setgeom_t *)NULL, &cd_cdevsw, &cd_cdevsw); (ds_setgeom_t *)NULL, &cd_cdevsw);
if (errcode != 0) if (errcode != 0)
goto bad; goto bad;
SC_DEBUG(sc_link, SDEV_DB3, ("Slice tables initialized ")); SC_DEBUG(sc_link, SDEV_DB3, ("Slice tables initialized "));

4
sys/scsi/od.c
View File

@ -28,7 +28,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: od.c,v 1.44 1998/07/29 11:15:51 bde Exp $ * $Id: od.c,v 1.45 1998/07/30 15:16:05 bde Exp $
*/ */
/* /*
@ -386,7 +386,7 @@ od_open(dev, mode, fmt, p, sc_link)
/* Initialize slice tables. */ /* Initialize slice tables. */
errcode = dsopen("od", dev, fmt, 0, &od->dk_slices, &label, odstrategy1, errcode = dsopen("od", dev, fmt, 0, &od->dk_slices, &label, odstrategy1,
(ds_setgeom_t *)NULL, &od_cdevsw, &od_cdevsw); (ds_setgeom_t *)NULL, &od_cdevsw);
if (errcode != 0) if (errcode != 0)
goto bad; goto bad;
SC_DEBUG(sc_link, SDEV_DB3, ("Slice tables initialized ")); SC_DEBUG(sc_link, SDEV_DB3, ("Slice tables initialized "));

4
sys/scsi/sd.c
View File

@ -14,7 +14,7 @@
* *
* Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992 * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
* *
* $Id: sd.c,v 1.137 1998/07/29 11:15:51 bde Exp $ * $Id: sd.c,v 1.138 1998/07/30 15:16:05 bde Exp $
*/ */
#include "opt_bounce.h" #include "opt_bounce.h"
@ -487,7 +487,7 @@ sd_open(dev_t dev, int mode, int fmt, struct proc *p, struct scsi_link *sc_link)
/* Initialize slice tables. */ /* Initialize slice tables. */
errcode = dsopen("sd", dev, fmt, 0, &sd->dk_slices, &label, sdstrategy1, errcode = dsopen("sd", dev, fmt, 0, &sd->dk_slices, &label, sdstrategy1,
(ds_setgeom_t *)NULL, &sd_cdevsw, &sd_cdevsw); (ds_setgeom_t *)NULL, &sd_cdevsw);
if (errcode != 0) if (errcode != 0)
goto close; goto close;
#endif /* !SLICE */ #endif /* !SLICE */

5
sys/sys/diskslice.h
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: diskslice.h,v 1.27 1998/08/14 08:04:39 dfr Exp $ * $Id: diskslice.h,v 1.28 1998/08/16 01:47:19 bde Exp $
*/ */
#ifndef _SYS_DISKSLICE_H_ #ifndef _SYS_DISKSLICE_H_
@ -69,7 +69,6 @@ struct diskslice {
}; };
struct diskslices { struct diskslices {
struct cdevsw *dss_bdevsw; /* for containing device */
struct cdevsw *dss_cdevsw; /* for containing device */ struct cdevsw *dss_cdevsw; /* for containing device */
int dss_first_bsd_slice; /* COMPATIBILITY_SLICE is mapped here */ int dss_first_bsd_slice; /* COMPATIBILITY_SLICE is mapped here */
u_int dss_nslices; /* actual dimension of dss_slices[] */ u_int dss_nslices; /* actual dimension of dss_slices[] */
@ -110,7 +109,7 @@ char *dsname __P((char *dname, int unit, int slice, int part,
int dsopen __P((char *dname, dev_t dev, int mode, u_int flags, int dsopen __P((char *dname, dev_t dev, int mode, u_int flags,
struct diskslices **sspp, struct disklabel *lp, struct diskslices **sspp, struct disklabel *lp,
void (*strat)(struct buf *bp), ds_setgeom_t *setgeom, void (*strat)(struct buf *bp), ds_setgeom_t *setgeom,
struct cdevsw *bdevsw, struct cdevsw *cdevsw)); struct cdevsw *cdevsw));
int dssize __P((dev_t dev, struct diskslices **sspp, int dssize __P((dev_t dev, struct diskslices **sspp,
int (*dopen)(dev_t dev, int oflags, int devtype, int (*dopen)(dev_t dev, int oflags, int devtype,
struct proc *p), struct proc *p),