diff options
| author | bde <bde@FreeBSD.org> | 1995-09-16 17:04:06 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1995-09-16 17:04:06 +0000 |
| commit | c7c302cc62d13fbb94de888397975d48f0b34ddc (patch) | |
| tree | 49fce373ccc1b7b659ad0172323dfe7e8e5a1a11 /sys/kern/subr_diskslice.c | |
| parent | f96d2d37101a40564bb5591c85fd4ce376c5ee3d (diff) | |
| download | FreeBSD-src-c7c302cc62d13fbb94de888397975d48f0b34ddc.zip FreeBSD-src-c7c302cc62d13fbb94de888397975d48f0b34ddc.tar.gz | |
Remove transitory labelling code. Labels are now handled by essentially
the original 4.4lite code. Machine Specific Partitions are now handled
separately.
Diffstat (limited to 'sys/kern/subr_diskslice.c')
| -rw-r--r-- | sys/kern/subr_diskslice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index 618f4f4..5555a81 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -43,7 +43,7 @@ * 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,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: subr_diskslice.c,v 1.13 1995/05/24 23:33:42 davidg Exp $ + * $Id: subr_diskslice.c,v 1.14 1995/05/30 08:05:51 rgrimes Exp $ */ #include <sys/param.h> @@ -454,7 +454,7 @@ dsioctl(dname, dev, cmd, data, flags, sspp, strat, setgeom) */ old_wlabel = sp->ds_wlabel; set_ds_wlabel(ssp, slice, TRUE); - error = correct_writedisklabel(dev, strat, sp->ds_label); + error = writedisklabel(dev, strat, sp->ds_label); /* XXX should invalidate in-core label if write failed. */ set_ds_wlabel(ssp, slice, old_wlabel); return (error); @@ -628,7 +628,7 @@ dsopen(dname, dev, mode, sspp, lp, strat, setgeom) *lp1 = *lp; lp = lp1; TRACE(("readdisklabel\n")); - msg = correct_readdisklabel(dkmodpart(dev, RAW_PART), strat, lp); + msg = readdisklabel(dkmodpart(dev, RAW_PART), strat, lp); #if 0 /* XXX */ if (msg == NULL && setgeom != NULL && setgeom(lp) != 0) msg = "setgeom failed"; |
