d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41d689b7b6
freebsd-nq/sys/kern/subr_diskslice.c

1059 lines
27 KiB
C
Raw Normal View History

subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
/*-
* Copyright (c) 1994 Bruce D. Evans.
* All rights reserved.
*
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* William Jolitz.
*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* 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 $
Moved initialization of defaults for the label for the whole disk from disklabel(8) to the kernel (dsopen()). Drivers should initialize the hardware values (rpm, interleave, skews). Drivers currently don't do this, but it usually doesn't matter since rotational position stuff is normally disabled.
1996-06-17 14:43:54 +00:00
* $Id: subr_diskslice.c,v 1.26 1996/06/12 05:07:31 gpalmer Exp $
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
*/
#include <sys/param.h>
#include <sys/buf.h>
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
#ifdef DEVFS
#include <sys/devfsext.h>
#endif
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
#include <sys/disklabel.h>
#include <sys/diskslice.h>
#include <sys/dkbad.h>
#include <sys/fcntl.h>
#include <sys/ioctl.h>
#include <sys/malloc.h>
#include <sys/stat.h>
#include <sys/syslog.h>
#include <sys/systm.h>
This should fix PR 438. Apparently I never tested disklabel on the block device. v_numoutput wasn't incremented to match the b_iodone nesting. It's still fishy that vwakeup() clears B_WRITEINPROG before biodone() has finished; however, B_WRITEINPROG seems to be never used. Submitted by: Bruce Evans
1995-05-24 23:33:42 +00:00
#include <sys/vnode.h>
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
Moved initialization of defaults for the label for the whole disk from disklabel(8) to the kernel (dsopen()). Drivers should initialize the hardware values (rpm, interleave, skews). Drivers currently don't do this, but it usually doesn't matter since rotational position stuff is normally disabled.
1996-06-17 14:43:54 +00:00
#include <ufs/ffs/fs.h>
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
#define b_cylinder b_resid
Don't warn about missing labels for non-BSD slices. Don't print debugging messages by default. Initialize the compatibility slice here and not in the machine-dependent code. Fix initialization of the label for the whole disk slice. Make it clear that write protection of labels doesn't apply when there is no label.
1995-03-04 11:42:27 +00:00
#define TRACE(str) do { if (ds_debug) printf str; } while (0)
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
typedef u_char bool_t;
Don't warn about missing labels for non-BSD slices. Don't print debugging messages by default. Initialize the compatibility slice here and not in the machine-dependent code. Fix initialization of the label for the whole disk slice. Make it clear that write protection of labels doesn't apply when there is no label.
1995-03-04 11:42:27 +00:00
static volatile bool_t ds_debug;
Keep absolute offsets in on-disk labels for backwards compatibility. This requires complications to adjust the offsets to relative when a block containing the label is read and back to absolute when such a block is written. The adjustment is not made on the whole disk slice. Don't allow setting the offset of partition C to nonzero in in-core labels. This will cause some (nonstandard) disktab entries to fail. They will need to be changed to have relative offsets (and no partitions outside of the slice). Don't write protect the (nonexistent) label on the whole disk slice. Writing labels and bootstraps should work right now (except if there is no DOSpartition table).
1995-02-18 22:10:44 +00:00
static void dsiodone __P((struct buf *bp));
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
static char *fixlabel __P((char *sname, struct diskslice *sp,
struct disklabel *lp, int writeflag));
Fixed removal of devfs entries for the real slice corresponding to the compatibility slice. They were forgotten on last-close and then creating them on first-open failed. Devfs entries for slices other than the one containing the root file system are still invisible unless you open a non-devfs inode on the slice.
1996-04-19 19:22:29 +00:00
static void free_ds_label __P((struct diskslices *ssp, int slice));
#ifdef DEVFS
static void free_ds_labeldevs __P((struct diskslices *ssp, int slice));
#endif
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
static void partition_info __P((char *sname, int part, struct partition *pp));
static void slice_info __P((char *sname, struct diskslice *sp));
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
static void set_ds_bad __P((struct diskslices *ssp, int slice,
struct dkbad_intern *btp));
static void set_ds_label __P((struct diskslices *ssp, int slice,
struct disklabel *lp));
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
#ifdef DEVFS
static void set_ds_labeldevs __P((char *dname, dev_t dev,
struct diskslices *ssp));
Fixed removal of devfs entries for the real slice corresponding to the compatibility slice. They were forgotten on last-close and then creating them on first-open failed. Devfs entries for slices other than the one containing the root file system are still invisible unless you open a non-devfs inode on the slice.
1996-04-19 19:22:29 +00:00
static void set_ds_labeldevs_unaliased __P((char *dname, dev_t dev,
struct diskslices *ssp));
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
#endif
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
static void set_ds_wlabel __P((struct diskslices *ssp, int slice,
int wlabel));
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
/*
* Determine the size of the transfer, and make sure it is
* within the boundaries of the partition. Adjust transfer
* if needed, and signal errors or early completion.
*
* XXX TODO:
* o Do bad sector remapping. May need to split buffer.
* o Split buffers that are too big for the device.
* o Check for overflow.
* o Finish cleaning this up.
*/
int
dscheck(bp, ssp)
struct buf *bp;
struct diskslices *ssp;
{
daddr_t blkno;
daddr_t labelsect;
struct disklabel *lp;
u_long maxsz;
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
char *msg;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
struct partition *pp;
struct diskslice *sp;
long sz;
Remove local TRUE & FALSE definitions. Fall into debugger on negative blk#.
1996-01-16 18:11:24 +00:00
if (bp->b_blkno < 0) {
Debugger("Slice code got negative blocknumber");
It's bad if the blockno is negative.
1996-01-07 22:39:06 +00:00
goto bad;
Remove local TRUE & FALSE definitions. Fall into debugger on negative blk#.
1996-01-16 18:11:24 +00:00
}
It's bad if the blockno is negative.
1996-01-07 22:39:06 +00:00
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
sp = &ssp->dss_slices[dkslice(bp->b_dev)];
lp = sp->ds_label;
sz = (bp->b_bcount + DEV_BSIZE - 1) >> DEV_BSHIFT;
if (lp == NULL) {
blkno = bp->b_blkno;
labelsect = -LABELSECTOR - 1;
maxsz = sp->ds_size;
} else {
labelsect = lp->d_partitions[LABEL_PART].p_offset;
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
if (labelsect != 0) Debugger("labelsect != 0 in dscheck()");
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
pp = &lp->d_partitions[dkpart(bp->b_dev)];
blkno = pp->p_offset + bp->b_blkno;
maxsz = pp->p_size;
Make bad144 debugging code conditional on ds_debug.
1995-04-24 06:04:36 +00:00
if (sp->ds_bad != NULL && ds_debug) {
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
daddr_t newblkno;
newblkno = transbad144(sp->ds_bad, blkno);
if (newblkno != blkno)
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
printf("should map bad block %lu -> %lu\n",
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
blkno, newblkno);
}
}
/* overwriting disk label ? */
/* XXX should also protect bootstrap in first 8K */
if (blkno <= LABELSECTOR + labelsect &&
#if LABELSECTOR != 0
bp->b_blkno + sz > LABELSECTOR + labelsect &&
#endif
(bp->b_flags & B_READ) == 0 && sp->ds_wlabel == 0) {
bp->b_error = EROFS;
goto bad;
}
#if defined(DOSBBSECTOR) && defined(notyet)
/* overwriting master boot record? */
if (blkno <= DOSBBSECTOR && (bp->b_flags & B_READ) == 0 &&
sp->ds_wlabel == 0) {
bp->b_error = EROFS;
goto bad;
}
#endif
/* beyond partition? */
if (bp->b_blkno < 0 || bp->b_blkno + sz > maxsz) {
/* if exactly at end of disk, return an EOF */
if (bp->b_blkno == maxsz) {
bp->b_resid = bp->b_bcount;
return (0);
}
/* or truncate if part of it fits */
sz = maxsz - bp->b_blkno;
if (sz <= 0) {
bp->b_error = EINVAL;
goto bad;
}
bp->b_bcount = sz << DEV_BSHIFT;
}
/* calculate cylinder for disksort to order transfers with */
bp->b_pblkno = blkno + sp->ds_offset;
if (lp == NULL)
Separate go-away code from dsinit() to produce dsgone(). Call correct_writedisklabel() instead of writedisklabel() (temporary compatibility hack). Remove kludge for allowing a label on slice 0.
1994-12-16 16:14:39 +00:00
bp->b_cylinder = 0; /* XXX always 0 would be better */
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
else
bp->b_cylinder = bp->b_pblkno / lp->d_secpercyl;
Keep absolute offsets in on-disk labels for backwards compatibility. This requires complications to adjust the offsets to relative when a block containing the label is read and back to absolute when such a block is written. The adjustment is not made on the whole disk slice. Don't allow setting the offset of partition C to nonzero in in-core labels. This will cause some (nonstandard) disktab entries to fail. They will need to be changed to have relative offsets (and no partitions outside of the slice). Don't write protect the (nonexistent) label on the whole disk slice. Writing labels and bootstraps should work right now (except if there is no DOSpartition table).
1995-02-18 22:10:44 +00:00
/*
* Snoop on label accesses if the slice offset is nonzero. Fudge
* offsets in the label to keep the in-core label coherent with
* the on-disk one.
*/
if (blkno <= LABELSECTOR + labelsect
#if LABELSECTOR != 0
&& bp->b_blkno + sz > LABELSECTOR + labelsect
#endif
&& sp->ds_offset != 0) {
struct iodone_chain *ic;
ic = malloc(sizeof *ic , M_DEVBUF, M_WAITOK);
ic->ic_prev_flags = bp->b_flags;
ic->ic_prev_iodone = bp->b_iodone;
ic->ic_prev_iodone_chain = bp->b_iodone_chain;
ic->ic_args[0].ia_long = (LABELSECTOR + labelsect - blkno)
<< DEV_BSHIFT;
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
ic->ic_args[1].ia_ptr = sp;
Keep absolute offsets in on-disk labels for backwards compatibility. This requires complications to adjust the offsets to relative when a block containing the label is read and back to absolute when such a block is written. The adjustment is not made on the whole disk slice. Don't allow setting the offset of partition C to nonzero in in-core labels. This will cause some (nonstandard) disktab entries to fail. They will need to be changed to have relative offsets (and no partitions outside of the slice). Don't write protect the (nonexistent) label on the whole disk slice. Writing labels and bootstraps should work right now (except if there is no DOSpartition table).
1995-02-18 22:10:44 +00:00
bp->b_flags |= B_CALL;
bp->b_iodone = dsiodone;
bp->b_iodone_chain = ic;
if (!(bp->b_flags & B_READ)) {
/*
* XXX even disklabel(8) writes directly so we need
* to adjust writes. Perhaps we should drop support
* for DIOCWLABEL (always write protect labels) and
* require the use of DIOCWDINFO.
*
* XXX probably need to copy the data to avoid even
* temporarily corrupting the in-core copy.
*/
This should fix PR 438. Apparently I never tested disklabel on the block device. v_numoutput wasn't incremented to match the b_iodone nesting. It's still fishy that vwakeup() clears B_WRITEINPROG before biodone() has finished; however, B_WRITEINPROG seems to be never used. Submitted by: Bruce Evans
1995-05-24 23:33:42 +00:00
if (bp->b_vp != NULL)
bp->b_vp->v_numoutput++;
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
msg = fixlabel((char *)NULL, sp,
(struct disklabel *)
(bp->b_data + ic->ic_args[0].ia_long),
TRUE);
if (msg != NULL) {
printf("%s\n", msg);
bp->b_error = EROFS;
goto bad;
}
Keep absolute offsets in on-disk labels for backwards compatibility. This requires complications to adjust the offsets to relative when a block containing the label is read and back to absolute when such a block is written. The adjustment is not made on the whole disk slice. Don't allow setting the offset of partition C to nonzero in in-core labels. This will cause some (nonstandard) disktab entries to fail. They will need to be changed to have relative offsets (and no partitions outside of the slice). Don't write protect the (nonexistent) label on the whole disk slice. Writing labels and bootstraps should work right now (except if there is no DOSpartition table).
1995-02-18 22:10:44 +00:00
}
}
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
return (1);
bad:
bp->b_flags |= B_ERROR;
return (-1);
}
void
dsclose(dev, mode, ssp)
dev_t dev;
int mode;
struct diskslices *ssp;
{
u_char mask;
struct diskslice *sp;
sp = &ssp->dss_slices[dkslice(dev)];
mask = 1 << dkpart(dev);
switch (mode) {
case S_IFBLK:
sp->ds_bopenmask &= ~mask;
break;
case S_IFCHR:
sp->ds_copenmask &= ~mask;
break;
}
sp->ds_openmask = sp->ds_bopenmask | sp->ds_copenmask;
}
Separate go-away code from dsinit() to produce dsgone(). Call correct_writedisklabel() instead of writedisklabel() (temporary compatibility hack). Remove kludge for allowing a label on slice 0.
1994-12-16 16:14:39 +00:00
void
dsgone(sspp)
struct diskslices **sspp;
{
int slice;
struct diskslice *sp;
struct diskslices *ssp;
for (slice = 0, ssp = *sspp; slice < ssp->dss_nslices; slice++) {
sp = &ssp->dss_slices[slice];
if (sp->ds_bad != NULL) {
free(sp->ds_bad, M_DEVBUF);
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
set_ds_bad(ssp, slice, (struct dkbad_intern *)NULL);
Separate go-away code from dsinit() to produce dsgone(). Call correct_writedisklabel() instead of writedisklabel() (temporary compatibility hack). Remove kludge for allowing a label on slice 0.
1994-12-16 16:14:39 +00:00
}
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
#ifdef DEVFS
if (sp->ds_bdev != NULL)
devfs_remove_dev(sp->ds_bdev);
if (sp->ds_cdev != NULL)
devfs_remove_dev(sp->ds_cdev);
#endif
Fixed removal of devfs entries for the real slice corresponding to the compatibility slice. They were forgotten on last-close and then creating them on first-open failed. Devfs entries for slices other than the one containing the root file system are still invisible unless you open a non-devfs inode on the slice.
1996-04-19 19:22:29 +00:00
free_ds_label(ssp, slice);
Separate go-away code from dsinit() to produce dsgone(). Call correct_writedisklabel() instead of writedisklabel() (temporary compatibility hack). Remove kludge for allowing a label on slice 0.
1994-12-16 16:14:39 +00:00
}
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
free(ssp, M_DEVBUF);
Separate go-away code from dsinit() to produce dsgone(). Call correct_writedisklabel() instead of writedisklabel() (temporary compatibility hack). Remove kludge for allowing a label on slice 0.
1994-12-16 16:14:39 +00:00
*sspp = NULL;
}
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
/*
* For the "write" commands (DIOCSBAD, DIOCSDINFO and DIOCWDINFO), this
* is subject to the same restriction as dsopen().
*/
int
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
dsioctl(dname, dev, cmd, data, flags, sspp, strat, setgeom)
char *dname;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
dev_t dev;
int cmd;
caddr_t data;
int flags;
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
struct diskslices **sspp;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
d_strategy_t *strat;
ds_setgeom_t *setgeom;
{
int error;
struct disklabel *lp;
int old_wlabel;
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
int slice;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
struct diskslice *sp;
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
struct diskslices *ssp;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
slice = dkslice(dev);
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
ssp = *sspp;
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
sp = &ssp->dss_slices[slice];
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
lp = sp->ds_label;
switch (cmd) {
case DIOCGDINFO:
if (lp == NULL)
return (EINVAL);
*(struct disklabel *)data = *lp;
return (0);
#ifdef notyet
case DIOCGDINFOP:
if (lp == NULL)
return (EINVAL);
*(struct disklabel **)data = lp;
return (0);
#endif
case DIOCGPART:
if (lp == NULL)
return (EINVAL);
((struct partinfo *)data)->disklab = lp;
((struct partinfo *)data)->part
= &lp->d_partitions[dkpart(dev)];
return (0);
Add ioctls DIOCGSLICEINFO and DIOCSYNCSLICEINFO. The latter isn't finished or tested.
1995-04-24 17:07:08 +00:00
case DIOCGSLICEINFO:
*(struct diskslices *)data = *ssp;
return (0);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
case DIOCSBAD:
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
if (slice == WHOLE_DISK_SLICE)
return (ENODEV);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
if (!(flags & FWRITE))
return (EBADF);
if (lp == NULL)
return (EINVAL);
if (sp->ds_bad != NULL)
free(sp->ds_bad, M_DEVBUF);
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
set_ds_bad(ssp, slice, internbad144((struct dkbad *)data, lp));
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
return (0);
case DIOCSDINFO:
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
if (slice == WHOLE_DISK_SLICE)
return (ENODEV);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
if (!(flags & FWRITE))
return (EBADF);
lp = malloc(sizeof *lp, M_DEVBUF, M_WAITOK);
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
if (sp->ds_label == NULL)
bzero(lp, sizeof *lp);
else
bcopy(sp->ds_label, lp, sizeof *lp);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
error = setdisklabel(lp, (struct disklabel *)data,
sp->ds_label != NULL
? sp->ds_openmask : (u_long)0);
Keep absolute offsets in on-disk labels for backwards compatibility. This requires complications to adjust the offsets to relative when a block containing the label is read and back to absolute when such a block is written. The adjustment is not made on the whole disk slice. Don't allow setting the offset of partition C to nonzero in in-core labels. This will cause some (nonstandard) disktab entries to fail. They will need to be changed to have relative offsets (and no partitions outside of the slice). Don't write protect the (nonexistent) label on the whole disk slice. Writing labels and bootstraps should work right now (except if there is no DOSpartition table).
1995-02-18 22:10:44 +00:00
/* XXX why doesn't setdisklabel() check this? */
if (error == 0 && lp->d_partitions[RAW_PART].p_offset != 0)
error = EINVAL;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
#if 0 /* XXX */
if (error != 0 && setgeom != NULL)
error = setgeom(lp);
#endif
if (error != 0) {
free(lp, M_DEVBUF);
return (error);
}
Fixed removal of devfs entries for the real slice corresponding to the compatibility slice. They were forgotten on last-close and then creating them on first-open failed. Devfs entries for slices other than the one containing the root file system are still invisible unless you open a non-devfs inode on the slice.
1996-04-19 19:22:29 +00:00
free_ds_label(ssp, slice);
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
set_ds_label(ssp, slice, lp);
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
#ifdef DEVFS
set_ds_labeldevs(dname, dev, ssp);
#endif
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
return (0);
Add ioctls DIOCGSLICEINFO and DIOCSYNCSLICEINFO. The latter isn't finished or tested.
1995-04-24 17:07:08 +00:00
case DIOCSYNCSLICEINFO:
if (slice != WHOLE_DISK_SLICE || dkpart(dev) != RAW_PART)
return (EINVAL);
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
if (!*(int *)data)
for (slice = 0; slice < ssp->dss_nslices; slice++) {
u_char openmask;
openmask = ssp->dss_slices[slice].ds_openmask;
if (openmask
&& (slice != WHOLE_DISK_SLICE
|| openmask & ~(1 << RAW_PART)))
return (EBUSY);
}
/*
* Temporarily forget the current slices struct and read
* the current one.
* XXX should wait for current accesses on this disk to
* complete, then lock out future accesses and opens.
*/
*sspp = NULL;
Add ioctls DIOCGSLICEINFO and DIOCSYNCSLICEINFO. The latter isn't finished or tested.
1995-04-24 17:07:08 +00:00
lp = malloc(sizeof *lp, M_DEVBUF, M_WAITOK);
*lp = *ssp->dss_slices[WHOLE_DISK_SLICE].ds_label;
Fix reopening of open subdevices for DIOCSYNCSLICEINFO: Reopen the bdev for the raw partition and not the cdev if only the bdev was open. Don't use a bogus limit for the number of partitions to possibly reopen (bug found by Julian). Add function dssize() to help fix wdsize() and sdsize(). The slice layer knows more about (un)open partitions and partition sizes than the driver layer.
1995-05-08 16:24:08 +00:00
error = dsopen(dname, dev,
ssp->dss_slices[WHOLE_DISK_SLICE].ds_copenmask
& (1 << RAW_PART) ? S_IFCHR : S_IFBLK,
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
sspp, lp, strat, setgeom, ssp->dss_bdevsw,
ssp->dss_cdevsw);
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
if (error != 0) {
free(lp, M_DEVBUF);
*sspp = ssp;
return (error);
}
Fix reopening of open subdevices for DIOCSYNCSLICEINFO: Reopen the bdev for the raw partition and not the cdev if only the bdev was open. Don't use a bogus limit for the number of partitions to possibly reopen (bug found by Julian). Add function dssize() to help fix wdsize() and sdsize(). The slice layer knows more about (un)open partitions and partition sizes than the driver layer.
1995-05-08 16:24:08 +00:00
/*
* Reopen everything. This is a no-op except in the "force"
* case and when the raw bdev and cdev are both open. Abort
* if anything fails.
*/
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
for (slice = 0; slice < ssp->dss_nslices; slice++) {
u_char openmask;
int part;
Fix reopening of open subdevices for DIOCSYNCSLICEINFO: Reopen the bdev for the raw partition and not the cdev if only the bdev was open. Don't use a bogus limit for the number of partitions to possibly reopen (bug found by Julian). Add function dssize() to help fix wdsize() and sdsize(). The slice layer knows more about (un)open partitions and partition sizes than the driver layer.
1995-05-08 16:24:08 +00:00
for (openmask = ssp->dss_slices[slice].ds_bopenmask,
part = 0; openmask; openmask >>= 1, part++) {
if (!(openmask & 1))
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
continue;
error = dsopen(dname,
dkmodslice(dkmodpart(dev, part),
slice),
S_IFBLK, sspp, lp, strat,
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
setgeom, ssp->dss_bdevsw,
ssp->dss_cdevsw);
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
if (error != 0) {
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
/* XXX should free devfs toks. */
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
free(lp, M_DEVBUF);
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
/* XXX should restore devfs toks. */
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
*sspp = ssp;
return (EBUSY);
}
}
Fix reopening of open subdevices for DIOCSYNCSLICEINFO: Reopen the bdev for the raw partition and not the cdev if only the bdev was open. Don't use a bogus limit for the number of partitions to possibly reopen (bug found by Julian). Add function dssize() to help fix wdsize() and sdsize(). The slice layer knows more about (un)open partitions and partition sizes than the driver layer.
1995-05-08 16:24:08 +00:00
for (openmask = ssp->dss_slices[slice].ds_copenmask,
part = 0; openmask; openmask >>= 1, part++) {
if (!(openmask & 1))
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
continue;
error = dsopen(dname,
dkmodslice(dkmodpart(dev, part),
slice),
S_IFCHR, sspp, lp, strat,
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
setgeom, ssp->dss_bdevsw,
ssp->dss_cdevsw);
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
if (error != 0) {
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
/* XXX should free devfs toks. */
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
free(lp, M_DEVBUF);
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
/* XXX should restore devfs toks. */
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
*sspp = ssp;
return (EBUSY);
}
}
}
Fix reopening of open subdevices for DIOCSYNCSLICEINFO: Reopen the bdev for the raw partition and not the cdev if only the bdev was open. Don't use a bogus limit for the number of partitions to possibly reopen (bug found by Julian). Add function dssize() to help fix wdsize() and sdsize(). The slice layer knows more about (un)open partitions and partition sizes than the driver layer.
1995-05-08 16:24:08 +00:00
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
/* XXX devfs tokens? */
Add ioctls DIOCGSLICEINFO and DIOCSYNCSLICEINFO. The latter isn't finished or tested.
1995-04-24 17:07:08 +00:00
free(lp, M_DEVBUF);
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
dsgone(&ssp);
return (0);
Add ioctls DIOCGSLICEINFO and DIOCSYNCSLICEINFO. The latter isn't finished or tested.
1995-04-24 17:07:08 +00:00
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
case DIOCWDINFO:
Change dsioctl() interface to allow DIOCSYNCSLICEINFO to update the caller's slice pointer and to print the device name in error messages. Finishing implementing DIOCSYNCSLICEINFO (except for locking).
1995-04-30 15:16:02 +00:00
error = dsioctl(dname, dev, DIOCSDINFO, data, flags, &ssp,
strat, setgeom);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
if (error != 0)
return (error);
/*
* XXX this used to hack on dk_openpart to fake opening
* partition 0 in case that is used instead of dkpart(dev).
*/
old_wlabel = sp->ds_wlabel;
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
set_ds_wlabel(ssp, slice, TRUE);
Remove transitory labelling code. Labels are now handled by essentially the original 4.4lite code. Machine Specific Partitions are now handled separately.
1995-09-16 17:04:06 +00:00
error = writedisklabel(dev, strat, sp->ds_label);
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
/* XXX should invalidate in-core label if write failed. */
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
set_ds_wlabel(ssp, slice, old_wlabel);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
return (error);
case DIOCWLABEL:
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
if (slice == WHOLE_DISK_SLICE)
return (ENODEV);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
if (!(flags & FWRITE))
return (EBADF);
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
set_ds_wlabel(ssp, slice, *(int *)data != 0);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
return (0);
default:
return (-1);
}
}
Keep absolute offsets in on-disk labels for backwards compatibility. This requires complications to adjust the offsets to relative when a block containing the label is read and back to absolute when such a block is written. The adjustment is not made on the whole disk slice. Don't allow setting the offset of partition C to nonzero in in-core labels. This will cause some (nonstandard) disktab entries to fail. They will need to be changed to have relative offsets (and no partitions outside of the slice). Don't write protect the (nonexistent) label on the whole disk slice. Writing labels and bootstraps should work right now (except if there is no DOSpartition table).
1995-02-18 22:10:44 +00:00
static void
dsiodone(bp)
struct buf *bp;
{
struct iodone_chain *ic;
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
char *msg;
Keep absolute offsets in on-disk labels for backwards compatibility. This requires complications to adjust the offsets to relative when a block containing the label is read and back to absolute when such a block is written. The adjustment is not made on the whole disk slice. Don't allow setting the offset of partition C to nonzero in in-core labels. This will cause some (nonstandard) disktab entries to fail. They will need to be changed to have relative offsets (and no partitions outside of the slice). Don't write protect the (nonexistent) label on the whole disk slice. Writing labels and bootstraps should work right now (except if there is no DOSpartition table).
1995-02-18 22:10:44 +00:00
ic = bp->b_iodone_chain;
bp->b_flags = (ic->ic_prev_flags & B_CALL)
| (bp->b_flags & ~(B_CALL | B_DONE));
bp->b_iodone = ic->ic_prev_iodone;
bp->b_iodone_chain = ic->ic_prev_iodone_chain;
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
if (!(bp->b_flags & B_READ)
|| (!(bp->b_flags & B_ERROR) && bp->b_error == 0)) {
msg = fixlabel((char *)NULL, ic->ic_args[1].ia_ptr,
(struct disklabel *)
(bp->b_data + ic->ic_args[0].ia_long),
FALSE);
if (msg != NULL)
printf("%s\n", msg);
}
Keep absolute offsets in on-disk labels for backwards compatibility. This requires complications to adjust the offsets to relative when a block containing the label is read and back to absolute when such a block is written. The adjustment is not made on the whole disk slice. Don't allow setting the offset of partition C to nonzero in in-core labels. This will cause some (nonstandard) disktab entries to fail. They will need to be changed to have relative offsets (and no partitions outside of the slice). Don't write protect the (nonexistent) label on the whole disk slice. Writing labels and bootstraps should work right now (except if there is no DOSpartition table).
1995-02-18 22:10:44 +00:00
free(ic, M_DEVBUF);
biodone(bp);
}
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
int
dsisopen(ssp)
struct diskslices *ssp;
{
int slice;
if (ssp == NULL)
return (0);
for (slice = 0; slice < ssp->dss_nslices; slice++)
if (ssp->dss_slices[slice].ds_openmask)
return (1);
return (0);
}
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
char *
dsname(dname, unit, slice, part, partname)
char *dname;
int unit;
int slice;
int part;
char *partname;
{
static char name[32];
if (strlen(dname) > 16)
dname = "nametoolong";
sprintf(name, "%s%d", dname, unit);
partname[0] = '\0';
if (slice != WHOLE_DISK_SLICE || part != RAW_PART) {
partname[0] = 'a' + part;
partname[1] = '\0';
if (slice != COMPATIBILITY_SLICE)
sprintf(name + strlen(name), "s%d", slice - 1);
}
return (name);
}
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
/*
* This should only be called when the unit is inactive and the strategy
* routine should not allow it to become active unless we call it. Our
* strategy routine must be special to allow activity.
*/
int
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
dsopen(dname, dev, mode, sspp, lp, strat, setgeom, bdevsw, cdevsw)
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
char *dname;
dev_t dev;
int mode;
struct diskslices **sspp;
struct disklabel *lp;
d_strategy_t *strat;
ds_setgeom_t *setgeom;
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
struct bdevsw *bdevsw;
struct cdevsw *cdevsw;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
{
int error;
Don't warn about missing labels for non-BSD slices. Don't print debugging messages by default. Initialize the compatibility slice here and not in the machine-dependent code. Fix initialization of the label for the whole disk slice. Make it clear that write protection of labels doesn't apply when there is no label.
1995-03-04 11:42:27 +00:00
struct disklabel *lp1;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
char *msg;
u_char mask;
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
#ifdef DEVFS
int mynor;
#endif
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
bool_t need_init;
int part;
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
char partname[2];
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
int slice;
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
char *sname;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
struct diskslice *sp;
struct diskslices *ssp;
int unit;
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
/*
* XXX reinitialize the slice table unless there is an open device
* on the unit. This should only be done if the media has changed.
*/
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
ssp = *sspp;
need_init = !dsisopen(ssp);
if (ssp != NULL && need_init)
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
dsgone(sspp);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
if (need_init) {
Don't warn about missing labels for non-BSD slices. Don't print debugging messages by default. Initialize the compatibility slice here and not in the machine-dependent code. Fix initialization of the label for the whole disk slice. Make it clear that write protection of labels doesn't apply when there is no label.
1995-03-04 11:42:27 +00:00
TRACE(("dsinit\n"));
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
error = dsinit(dname, dev, strat, lp, sspp);
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
if (error != 0) {
dsgone(sspp);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
return (error);
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
}
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
lp->d_npartitions = RAW_PART + 1;
lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
ssp = *sspp;
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
#ifdef DEVFS
ssp->dss_bdevsw = bdevsw;
ssp->dss_cdevsw = cdevsw;
#endif
Don't warn about missing labels for non-BSD slices. Don't print debugging messages by default. Initialize the compatibility slice here and not in the machine-dependent code. Fix initialization of the label for the whole disk slice. Make it clear that write protection of labels doesn't apply when there is no label.
1995-03-04 11:42:27 +00:00
/*
* If there are no real slices, then make the compatiblity
* slice cover the whole disk.
*/
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
if (ssp->dss_nslices == BASE_SLICE)
ssp->dss_slices[COMPATIBILITY_SLICE].ds_size
= lp->d_secperunit;
Don't warn about missing labels for non-BSD slices. Don't print debugging messages by default. Initialize the compatibility slice here and not in the machine-dependent code. Fix initialization of the label for the whole disk slice. Make it clear that write protection of labels doesn't apply when there is no label.
1995-03-04 11:42:27 +00:00
/* Point the compatibility slice at the BSD slice, if any. */
for (slice = BASE_SLICE, sp = &ssp->dss_slices[BASE_SLICE];
slice < ssp->dss_nslices; slice++, sp++)
if (sp->ds_type == DOSPTYP_386BSD /* XXX */) {
ssp->dss_first_bsd_slice = slice;
ssp->dss_slices[COMPATIBILITY_SLICE].ds_offset
= sp->ds_offset;
ssp->dss_slices[COMPATIBILITY_SLICE].ds_size
= sp->ds_size;
ssp->dss_slices[COMPATIBILITY_SLICE].ds_type
= sp->ds_type;
break;
}
lp1 = malloc(sizeof *lp1, M_DEVBUF, M_WAITOK);
*lp1 = *lp;
Moved initialization of defaults for the label for the whole disk from disklabel(8) to the kernel (dsopen()). Drivers should initialize the hardware values (rpm, interleave, skews). Drivers currently don't do this, but it usually doesn't matter since rotational position stuff is normally disabled.
1996-06-17 14:43:54 +00:00
/*
* Initialize defaults for the label for the whole disk so
* that it can be used as a template for disklabel(8).
* d_rpm = 3600 is unlikely to be correct for a modern
* disk, but d_rpm is normally irrelevant.
*/
if (lp1->d_rpm == 0)
lp1->d_rpm = 3600;
if (lp1->d_interleave == 0)
lp1->d_interleave = 1;
if (lp1->d_npartitions == 0)
lp1->d_npartitions = MAXPARTITIONS;
if (lp1->d_bbsize == 0)
lp1->d_bbsize = BBSIZE;
if (lp1->d_sbsize == 0)
lp1->d_sbsize = SBSIZE;
Don't warn about missing labels for non-BSD slices. Don't print debugging messages by default. Initialize the compatibility slice here and not in the machine-dependent code. Fix initialization of the label for the whole disk slice. Make it clear that write protection of labels doesn't apply when there is no label.
1995-03-04 11:42:27 +00:00
ssp->dss_slices[WHOLE_DISK_SLICE].ds_label = lp1;
ssp->dss_slices[WHOLE_DISK_SLICE].ds_wlabel = TRUE;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
if (setgeom != NULL) {
error = setgeom(lp);
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
if (error != 0) {
dsgone(sspp);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
return (error);
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
}
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
}
}
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
slice = dkslice(dev);
if (slice >= ssp->dss_nslices)
return (ENXIO);
sp = &ssp->dss_slices[slice];
part = dkpart(dev);
unit = dkunit(dev);
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
#ifdef DEVFS
if (slice >= BASE_SLICE && sp->ds_bdev == NULL && sp->ds_size != 0) {
mynor = minor(dkmodpart(dev, RAW_PART));
Fixed group of disk devices (was wheel or games, now operator). Added scsi control devices. Converted almost everything that I changed to use devfs_add_devswf() and verbose id macros. st.c: Renamed enrst* to erst* since that's what the current name is (enrst seems to be an old name).
1996-03-27 18:50:10 +00:00
sname = dsname(dname, unit, slice, RAW_PART, partname);
Cleaned up naming and formatting in recent changes.
1996-04-07 14:32:14 +00:00
sp->ds_bdev = devfs_add_devswf(bdevsw, mynor, DV_BLK,
UID_ROOT, GID_OPERATOR, 0640,
"%s", sname);
sp->ds_cdev = devfs_add_devswf(cdevsw, mynor, DV_CHR,
UID_ROOT, GID_OPERATOR, 0640,
"r%s", sname);
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
}
#endif
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
if (sp->ds_label == NULL) {
Don't warn about missing labels for non-BSD slices. Don't print debugging messages by default. Initialize the compatibility slice here and not in the machine-dependent code. Fix initialization of the label for the whole disk slice. Make it clear that write protection of labels doesn't apply when there is no label.
1995-03-04 11:42:27 +00:00
set_ds_wlabel(ssp, slice, TRUE); /* XXX invert */
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
lp1 = malloc(sizeof *lp1, M_DEVBUF, M_WAITOK);
*lp1 = *lp;
Remove trailing whitespace.
1995-05-30 08:16:23 +00:00
lp = lp1;
Don't warn about missing labels for non-BSD slices. Don't print debugging messages by default. Initialize the compatibility slice here and not in the machine-dependent code. Fix initialization of the label for the whole disk slice. Make it clear that write protection of labels doesn't apply when there is no label.
1995-03-04 11:42:27 +00:00
TRACE(("readdisklabel\n"));
Remove transitory labelling code. Labels are now handled by essentially the original 4.4lite code. Machine Specific Partitions are now handled separately.
1995-09-16 17:04:06 +00:00
msg = readdisklabel(dkmodpart(dev, RAW_PART), strat, lp);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
#if 0 /* XXX */
if (msg == NULL && setgeom != NULL && setgeom(lp) != 0)
msg = "setgeom failed";
#endif
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
sname = dsname(dname, unit, slice, RAW_PART, partname);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
if (msg == NULL)
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
msg = fixlabel(sname, sp, lp, FALSE);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
if (msg != NULL) {
free(lp, M_DEVBUF);
Don't warn about missing labels for non-BSD slices. Don't print debugging messages by default. Initialize the compatibility slice here and not in the machine-dependent code. Fix initialization of the label for the whole disk slice. Make it clear that write protection of labels doesn't apply when there is no label.
1995-03-04 11:42:27 +00:00
if (sp->ds_type == DOSPTYP_386BSD /* XXX */)
log(LOG_WARNING, "%s: cannot find label (%s)\n",
sname, msg);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
if (part == RAW_PART)
goto out;
return (EINVAL); /* XXX needs translation */
}
if (lp->d_flags & D_BADSECT) {
struct dkbad *btp;
btp = malloc(sizeof *btp, M_DEVBUF, M_WAITOK);
Don't warn about missing labels for non-BSD slices. Don't print debugging messages by default. Initialize the compatibility slice here and not in the machine-dependent code. Fix initialization of the label for the whole disk slice. Make it clear that write protection of labels doesn't apply when there is no label.
1995-03-04 11:42:27 +00:00
TRACE(("readbad144\n"));
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
msg = readbad144(dev, strat, lp, btp);
if (msg != NULL) {
log(LOG_WARNING,
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
"%s: cannot find bad sector table (%s)\n",
sname, msg);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
free(btp, M_DEVBUF);
free(lp, M_DEVBUF);
if (part == RAW_PART)
goto out;
return (EINVAL); /* XXX needs translation */
}
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
set_ds_bad(ssp, slice, internbad144(btp, lp));
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
free(btp, M_DEVBUF);
if (sp->ds_bad == NULL) {
free(lp, M_DEVBUF);
if (part == RAW_PART)
goto out;
return (EINVAL); /* XXX needs translation */
}
}
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
set_ds_label(ssp, slice, lp);
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
#ifdef DEVFS
set_ds_labeldevs(dname, dev, ssp);
#endif
Don't warn about missing labels for non-BSD slices. Don't print debugging messages by default. Initialize the compatibility slice here and not in the machine-dependent code. Fix initialization of the label for the whole disk slice. Make it clear that write protection of labels doesn't apply when there is no label.
1995-03-04 11:42:27 +00:00
set_ds_wlabel(ssp, slice, FALSE);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
}
if (part != RAW_PART
&& (sp->ds_label == NULL || part >= sp->ds_label->d_npartitions))
return (EINVAL); /* XXX needs translation */
out:
mask = 1 << part;
switch (mode) {
case S_IFBLK:
sp->ds_bopenmask |= mask;
break;
case S_IFCHR:
sp->ds_copenmask |= mask;
break;
}
sp->ds_openmask = sp->ds_bopenmask | sp->ds_copenmask;
return (0);
}
Fix reopening of open subdevices for DIOCSYNCSLICEINFO: Reopen the bdev for the raw partition and not the cdev if only the bdev was open. Don't use a bogus limit for the number of partitions to possibly reopen (bug found by Julian). Add function dssize() to help fix wdsize() and sdsize(). The slice layer knows more about (un)open partitions and partition sizes than the driver layer.
1995-05-08 16:24:08 +00:00
int
dssize(dev, sspp, dopen, dclose)
dev_t dev;
struct diskslices **sspp;
d_open_t dopen;
d_close_t dclose;
{
struct disklabel *lp;
int part;
int slice;
struct diskslices *ssp;
slice = dkslice(dev);
part = dkpart(dev);
ssp = *sspp;
if (ssp == NULL || slice >= ssp->dss_nslices
|| !(ssp->dss_slices[slice].ds_bopenmask & (1 << part))) {
if (dopen(dev, FREAD, S_IFBLK, (struct proc *)NULL) != 0)
return (-1);
dclose(dev, FREAD, S_IFBLK, (struct proc *)NULL);
ssp = *sspp;
}
lp = ssp->dss_slices[slice].ds_label;
if (lp == NULL)
return (-1);
return ((int)lp->d_partitions[part].p_size);
}
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
static void
Fixed removal of devfs entries for the real slice corresponding to the compatibility slice. They were forgotten on last-close and then creating them on first-open failed. Devfs entries for slices other than the one containing the root file system are still invisible unless you open a non-devfs inode on the slice.
1996-04-19 19:22:29 +00:00
free_ds_label(ssp, slice)
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
struct diskslices *ssp;
int slice;
{
struct disklabel *lp;
struct diskslice *sp;
sp = &ssp->dss_slices[slice];
lp = sp->ds_label;
Fixed removal of devfs entries for the real slice corresponding to the compatibility slice. They were forgotten on last-close and then creating them on first-open failed. Devfs entries for slices other than the one containing the root file system are still invisible unless you open a non-devfs inode on the slice.
1996-04-19 19:22:29 +00:00
if (lp == NULL)
return;
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
#ifdef DEVFS
Fixed removal of devfs entries for the real slice corresponding to the compatibility slice. They were forgotten on last-close and then creating them on first-open failed. Devfs entries for slices other than the one containing the root file system are still invisible unless you open a non-devfs inode on the slice.
1996-04-19 19:22:29 +00:00
free_ds_labeldevs(ssp, slice);
if (slice == COMPATIBILITY_SLICE)
free_ds_labeldevs(ssp, ssp->dss_first_bsd_slice);
else if (slice == ssp->dss_first_bsd_slice)
free_ds_labeldevs(ssp, COMPATIBILITY_SLICE);
#endif
free(lp, M_DEVBUF);
set_ds_label(ssp, slice, (struct disklabel *)NULL);
}
#ifdef DEVFS
static void
free_ds_labeldevs(ssp, slice)
struct diskslices *ssp;
int slice;
{
struct disklabel *lp;
int part;
struct diskslice *sp;
sp = &ssp->dss_slices[slice];
lp = sp->ds_label;
if (lp == NULL)
return;
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
for (part = 0; part < lp->d_npartitions; part++) {
Fixed dangling pointer bugs in DIOCSDINFO. Enabled DEVFS support. It doesn't work while devfs is mounted (add_devfs_devsw() doesn't work then), but seems to be safe.
1996-01-28 08:15:44 +00:00
if (sp->ds_bdevs[part] != NULL) {
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
devfs_remove_dev(sp->ds_bdevs[part]);
Fixed dangling pointer bugs in DIOCSDINFO. Enabled DEVFS support. It doesn't work while devfs is mounted (add_devfs_devsw() doesn't work then), but seems to be safe.
1996-01-28 08:15:44 +00:00
sp->ds_bdevs[part] = NULL;
}
if (sp->ds_cdevs[part] != NULL) {
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
devfs_remove_dev(sp->ds_cdevs[part]);
Fixed dangling pointer bugs in DIOCSDINFO. Enabled DEVFS support. It doesn't work while devfs is mounted (add_devfs_devsw() doesn't work then), but seems to be safe.
1996-01-28 08:15:44 +00:00
sp->ds_cdevs[part] = NULL;
}
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
}
}
Fixed removal of devfs entries for the real slice corresponding to the compatibility slice. They were forgotten on last-close and then creating them on first-open failed. Devfs entries for slices other than the one containing the root file system are still invisible unless you open a non-devfs inode on the slice.
1996-04-19 19:22:29 +00:00
#endif
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
static char *
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
fixlabel(sname, sp, lp, writeflag)
char *sname;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
struct diskslice *sp;
struct disklabel *lp;
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
int writeflag;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
{
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
u_long end;
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
u_long offset;
Keep absolute offsets in on-disk labels for backwards compatibility. This requires complications to adjust the offsets to relative when a block containing the label is read and back to absolute when such a block is written. The adjustment is not made on the whole disk slice. Don't allow setting the offset of partition C to nonzero in in-core labels. This will cause some (nonstandard) disktab entries to fail. They will need to be changed to have relative offsets (and no partitions outside of the slice). Don't write protect the (nonexistent) label on the whole disk slice. Writing labels and bootstraps should work right now (except if there is no DOSpartition table).
1995-02-18 22:10:44 +00:00
int part;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
struct partition *pp;
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
u_long start;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
bool_t warned;
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
/* These errors "can't happen" so don't bother reporting details. */
if (lp->d_magic != DISKMAGIC || lp->d_magic2 != DISKMAGIC)
return ("fixlabel: invalid magic");
if (dkcksum(lp) != 0)
return ("fixlabel: invalid checksum");
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
pp = &lp->d_partitions[RAW_PART];
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
if (writeflag) {
start = 0;
offset = sp->ds_offset;
} else {
start = sp->ds_offset;
offset = -sp->ds_offset;
}
if (pp->p_offset != start) {
if (sname != NULL) {
printf(
"%s: rejecting BSD label: raw partition offset != slice offset\n",
sname);
slice_info(sname, sp);
partition_info(sname, RAW_PART, pp);
}
return ("fixlabel: raw partition offset != slice offset");
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
}
if (pp->p_size != sp->ds_size) {
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
if (sname != NULL) {
printf("%s: raw partition size != slice size\n", sname);
slice_info(sname, sp);
partition_info(sname, RAW_PART, pp);
}
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
if (pp->p_size > sp->ds_size) {
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
if (sname == NULL)
return ("fixlabel: raw partition size > slice size");
printf("%s: truncating raw partition\n", sname);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
pp->p_size = sp->ds_size;
}
}
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
end = start + sp->ds_size;
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
if (start > end)
return ("fixlabel: slice wraps");
if (lp->d_secpercyl <= 0)
return ("fixlabel: d_secpercyl <= 0");
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
pp -= RAW_PART;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
warned = FALSE;
Keep absolute offsets in on-disk labels for backwards compatibility. This requires complications to adjust the offsets to relative when a block containing the label is read and back to absolute when such a block is written. The adjustment is not made on the whole disk slice. Don't allow setting the offset of partition C to nonzero in in-core labels. This will cause some (nonstandard) disktab entries to fail. They will need to be changed to have relative offsets (and no partitions outside of the slice). Don't write protect the (nonexistent) label on the whole disk slice. Writing labels and bootstraps should work right now (except if there is no DOSpartition table).
1995-02-18 22:10:44 +00:00
for (part = 0; part < lp->d_npartitions; part++, pp++) {
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
if (pp->p_offset != 0 || pp->p_size != 0) {
if (pp->p_offset < start
|| pp->p_offset + pp->p_size > end
|| pp->p_offset + pp->p_size < pp->p_offset) {
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
if (sname != NULL) {
printf(
"%s: rejecting partition in BSD label: it isn't entirely within the slice\n",
sname);
if (!warned) {
slice_info(sname, sp);
warned = TRUE;
}
partition_info(sname, part, pp);
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
}
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
/* XXX else silently discard junk. */
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
bzero(pp, sizeof *pp);
} else
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
pp->p_offset += offset;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
}
}
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
lp->d_ncylinders = sp->ds_size / lp->d_secpercyl;
lp->d_secperunit = sp->ds_size;
Discard junk from partition tables when reading the tables for applications the same as when initializing the in-core copies. Adjust checksums in labels after adjusting labels. This finishes fudging the on-disk label to make it coherent with the in-core label. Handle EIO during initialization better. Initialize the compatibility slice to the whole disk If there are no real slices. Don't warn about adjusting offsets in the label to make the 'c' partition start at 0. The 'c' offset is now always absolute on-disk and 0 in-core so an adjustment is usually required. Don't confuse LABEL_PART with RAW_PART so much. Check for partitions being within slices differently.
1995-02-21 08:38:24 +00:00
lp->d_checksum = 0;
lp->d_checksum = dkcksum(lp);
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
return (NULL);
}
static void
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
partition_info(sname, part, pp)
char *sname;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
int part;
struct partition *pp;
{
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
printf("%s%c: start %lu, end %lu, size %lu\n", sname, 'a' + part,
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
pp->p_offset, pp->p_offset + pp->p_size - 1, pp->p_size);
}
static void
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
slice_info(sname, sp)
char *sname;
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
struct diskslice *sp;
{
Fix initialization of the copy of the label passed to setdisklabel(). Fix the sign of the adjustment after writing a label. Writing of labels should work now. Merge adjust_label() into fixlabel(). Detect more errors and don't write if there is an error. Adjust sectors/unit and total sectors to the numbers on the slice. Add a function dsname() to print slice device names consistently, and use it.
1995-02-22 21:51:53 +00:00
printf("%s: start %lu, end %lu, size %lu\n", sname,
subr_diskslice.c implements everything related to slices and labels except reading and writing the slice tables and labels. subr_dkbad.c implements everything related to bad sector remapping using the bad144 format.
1994-12-12 00:20:34 +00:00
sp->ds_offset, sp->ds_offset + sp->ds_size - 1, sp->ds_size);
}
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
Keep absolute offsets in on-disk labels for backwards compatibility. This requires complications to adjust the offsets to relative when a block containing the label is read and back to absolute when such a block is written. The adjustment is not made on the whole disk slice. Don't allow setting the offset of partition C to nonzero in in-core labels. This will cause some (nonstandard) disktab entries to fail. They will need to be changed to have relative offsets (and no partitions outside of the slice). Don't write protect the (nonexistent) label on the whole disk slice. Writing labels and bootstraps should work right now (except if there is no DOSpartition table).
1995-02-18 22:10:44 +00:00
/*
* Most changes to ds_bad, ds_label and ds_wlabel are made using the
* following functions to ensure coherency of the compatibility slice
* with the first BSD slice. The openmask fields are _not_ shared and
* the other fields (ds_offset and ds_size) aren't changed after they
* are initialized.
*/
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
static void
set_ds_bad(ssp, slice, btp)
struct diskslices *ssp;
int slice;
struct dkbad_intern *btp;
{
ssp->dss_slices[slice].ds_bad = btp;
if (slice == COMPATIBILITY_SLICE)
ssp->dss_slices[ssp->dss_first_bsd_slice].ds_bad = btp;
else if (slice == ssp->dss_first_bsd_slice)
ssp->dss_slices[COMPATIBILITY_SLICE].ds_bad = btp;
}
static void
set_ds_label(ssp, slice, lp)
struct diskslices *ssp;
int slice;
struct disklabel *lp;
{
ssp->dss_slices[slice].ds_label = lp;
if (slice == COMPATIBILITY_SLICE)
ssp->dss_slices[ssp->dss_first_bsd_slice].ds_label = lp;
else if (slice == ssp->dss_first_bsd_slice)
ssp->dss_slices[COMPATIBILITY_SLICE].ds_label = lp;
}
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
#ifdef DEVFS
static void
set_ds_labeldevs(dname, dev, ssp)
char *dname;
dev_t dev;
struct diskslices *ssp;
Fixed removal of devfs entries for the real slice corresponding to the compatibility slice. They were forgotten on last-close and then creating them on first-open failed. Devfs entries for slices other than the one containing the root file system are still invisible unless you open a non-devfs inode on the slice.
1996-04-19 19:22:29 +00:00
{
int slice;
set_ds_labeldevs_unaliased(dname, dev, ssp);
slice = dkslice(dev);
if (slice == COMPATIBILITY_SLICE)
set_ds_labeldevs_unaliased(dname,
dkmodslice(dev, ssp->dss_first_bsd_slice), ssp);
else if (slice == ssp->dss_first_bsd_slice)
set_ds_labeldevs_unaliased(dname,
dkmodslice(dev, COMPATIBILITY_SLICE), ssp);
}
static void
set_ds_labeldevs_unaliased(dname, dev, ssp)
char *dname;
dev_t dev;
struct diskslices *ssp;
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
{
struct disklabel *lp;
int mynor;
int part;
char partname[2];
struct partition *pp;
int slice;
Cleaned up naming and formatting in recent changes.
1996-04-07 14:32:14 +00:00
char *sname;
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
struct diskslice *sp;
slice = dkslice(dev);
sp = &ssp->dss_slices[slice];
if (sp->ds_size == 0)
return;
lp = sp->ds_label;
for (part = 0; part < lp->d_npartitions; part++) {
pp = &lp->d_partitions[part];
if (pp->p_size == 0)
continue;
Cleaned up naming and formatting in recent changes.
1996-04-07 14:32:14 +00:00
sname = dsname(dname, dkunit(dev), slice, part, partname);
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
if (part == RAW_PART && sp->ds_bdev != NULL) {
sp->ds_bdevs[part] =
Cleaned up naming and formatting in recent changes.
1996-04-07 14:32:14 +00:00
devfs_link(sp->ds_bdev,
"%s%s", sname, partname);
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
sp->ds_cdevs[part] =
Cleaned up naming and formatting in recent changes.
1996-04-07 14:32:14 +00:00
devfs_link(sp->ds_cdev,
"r%s%s", sname, partname);
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
} else {
mynor = minor(dkmodpart(dev, part));
sp->ds_bdevs[part] =
Fixed group of disk devices (was wheel or games, now operator). Added scsi control devices. Converted almost everything that I changed to use devfs_add_devswf() and verbose id macros. st.c: Renamed enrst* to erst* since that's what the current name is (enrst seems to be an old name).
1996-03-27 18:50:10 +00:00
devfs_add_devswf(ssp->dss_bdevsw, mynor, DV_BLK,
UID_ROOT, GID_OPERATOR, 0640,
Cleaned up naming and formatting in recent changes.
1996-04-07 14:32:14 +00:00
"%s%s", sname, partname);
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
sp->ds_cdevs[part] =
Fixed group of disk devices (was wheel or games, now operator). Added scsi control devices. Converted almost everything that I changed to use devfs_add_devswf() and verbose id macros. st.c: Renamed enrst* to erst* since that's what the current name is (enrst seems to be an old name).
1996-03-27 18:50:10 +00:00
devfs_add_devswf(ssp->dss_cdevsw, mynor, DV_CHR,
UID_ROOT, GID_OPERATOR, 0640,
Cleaned up naming and formatting in recent changes.
1996-04-07 14:32:14 +00:00
"r%s%s", sname, partname);
[Oops, forgot to commit this together with things that depend on it.] First attempt at creating devfs entries for sliced devices. Doesn't quite work yet, so the heart of it is disabled. Added bdev and cdev args to dsopen(). Create devfs entries in dsopen() and (unsuccessfully) attempt to make them go away at the right times. DEVFS is #undefed at the start so that this shouldn't cause problems.
1996-01-27 09:34:21 +00:00
}
}
}
#endif /* DEVFS */
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
static void
set_ds_wlabel(ssp, slice, wlabel)
struct diskslices *ssp;
int slice;
int wlabel;
{
ssp->dss_slices[slice].ds_wlabel = wlabel;
if (slice == COMPATIBILITY_SLICE)
ssp->dss_slices[ssp->dss_first_bsd_slice].ds_wlabel = wlabel;
else if (slice == ssp->dss_first_bsd_slice)
ssp->dss_slices[COMPATIBILITY_SLICE].ds_wlabel = wlabel;
}
Reference in New Issue Copy Permalink