diff options
| author |   krw <krw@openbsd.org> | 2015-09-10 16:30:23 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2015-09-10 16:30:23 +0000 |
| commit | f49e8dcaf0ca2c7c04e24e30f480a43b8a97eb68 (patch) | |
| tree | 13e82185abee116e5a480880da1bdb5994d5a23d /sys/kern/subr_disk.c | |
| parent | CRYPTO_set_mem_debug_functions() and CRYPTO_set_mem_functions() are already (diff) | |
| download | wireguard-openbsd-f49e8dcaf0ca2c7c04e24e30f480a43b8a97eb68.tar.xz wireguard-openbsd-f49e8dcaf0ca2c7c04e24e30f480a43b8a97eb68.zip | |
Now that the GPT code tries really hard not to get in the way and
accidentally capture disks ...
Eliminate kernel option GPT and associated #ifdef GPT/#endif. Let
everybody get on the GPT bandwagon and we'll see what wheels fly
off.
Requested by & ok deraadt@
Diffstat (limited to 'sys/kern/subr_disk.c')
| -rw-r--r-- | sys/kern/subr_disk.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 8c2ed620f85..71f290b9db3 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.203 2015/09/10 14:28:17 krw Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.204 2015/09/10 16:30:23 krw Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -66,9 +66,7 @@ #include <dev/rndvar.h> #include <dev/cons.h> -#ifdef GPT #include <lib/libz/zlib.h> -#endif #include "softraid.h" @@ -106,9 +104,7 @@ void disk_attach_callback(void *); int readdisksector(struct buf *, void (*)(struct buf *), struct disklabel *, u_int64_t); -#ifdef GPT int gpt_chk_mbr(struct dos_partition *, struct disklabel *); -#endif /* * Compute checksum for disk label. @@ -370,7 +366,6 @@ readdoslabel(struct buf *bp, void (*strat)(struct buf *), (bp->b_data[511] & 0xff); if (mbrtest != 0x55aa) goto notmbr; -#ifdef GPT if (gpt_chk_mbr(dp, lp) == 0) { error = readgptlabel(bp, strat, lp, partoffp ? &dospartoff : NULL, spoofonly); @@ -386,7 +381,6 @@ readdoslabel(struct buf *bp, void (*strat)(struct buf *), goto notmbr; } } -#endif } if (ourpart == -1) { @@ -571,8 +565,6 @@ notfat: return (error); } -#ifdef GPT - int gpt_chk_hdr(struct gpt_header *); int gpt_chk_parts(struct gpt_header *, struct gpt_partition *); int get_fstype(struct uuid *); @@ -896,8 +888,6 @@ readgptlabel(struct buf *bp, void (*strat)(struct buf *), return (error); } -#endif - /* * Check new disk label for sensibility before setting it. */ |