diff options
| author |   krw <krw@openbsd.org> | 2007-06-23 03:11:34 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2007-06-23 03:11:34 +0000 |
| commit | 9d61b4a6a84b54780c23ff6bd20ede67d11a7017 (patch) | |
| tree | 1aaac2f5d3e7aa3811da777908fa58f945281b3f /sys/dev/raidframe | |
| parent | sync (diff) | |
| download | wireguard-openbsd-9d61b4a6a84b54780c23ff6bd20ede67d11a7017.tar.xz wireguard-openbsd-9d61b4a6a84b54780c23ff6bd20ede67d11a7017.zip | |
Remove raidmakedisklabel(). The only invocation was commented out in
2000, presumably because we spoof a label when one is not found. This
removes the last (?) code that assigned a file type other than
FS_UNUSED to the RAW_PART partition.
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_openbsdkintf.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/sys/dev/raidframe/rf_openbsdkintf.c b/sys/dev/raidframe/rf_openbsdkintf.c index 0df3988cd00..02c9c6ce792 100644 --- a/sys/dev/raidframe/rf_openbsdkintf.c +++ b/sys/dev/raidframe/rf_openbsdkintf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_openbsdkintf.c,v 1.41 2007/06/20 18:18:47 deraadt Exp $ */ +/* $OpenBSD: rf_openbsdkintf.c,v 1.42 2007/06/23 03:11:34 krw Exp $ */ /* $NetBSD: rf_netbsdkintf.c,v 1.109 2001/07/27 03:30:07 oster Exp $ */ /*- @@ -271,7 +271,6 @@ struct raid_softc **raid_scPtrs; void rf_shutdown_hook(RF_ThreadArg_t); void raidgetdefaultlabel(RF_Raid_t *, struct raid_softc *, struct disklabel *); void raidgetdisklabel(dev_t, struct disklabel *, int); -void raidmakedisklabel(struct raid_softc *); int raidlock(struct raid_softc *); void raidunlock(struct raid_softc *); @@ -2148,7 +2147,6 @@ raidgetdisklabel(dev_t dev, struct disklabel *lp, int spoofonly) if (errstring) { /*printf("%s: %s\n", rs->sc_xname, errstring);*/ return; - /*raidmakedisklabel(rs);*/ } /* @@ -2176,28 +2174,6 @@ raidgetdisklabel(dev_t dev, struct disklabel *lp, int spoofonly) } /* - * Take care of things one might want to take care of in the event - * that a disklabel isn't present. - */ -void -raidmakedisklabel(struct raid_softc *rs) -{ - struct disklabel *lp = rs->sc_dkdev.dk_label; - db1_printf(("Making a label..\n")); - - /* - * For historical reasons, if there's no disklabel present - * the raw partition must be marked FS_BSDFFS. - */ - - lp->d_partitions[RAW_PART].p_fstype = FS_BSDFFS; - - strncpy(lp->d_packname, "default label", sizeof(lp->d_packname)); - - lp->d_checksum = dkcksum(lp); -} - -/* * Lookup the provided name in the filesystem. If the file exists, * is a valid block device, and isn't being used by anyone else, * set *vpp to the file's vnode. |