diff options
| author |   krw <krw@openbsd.org> | 2007-06-01 00:07:48 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2007-06-01 00:07:48 +0000 |
| commit | 27fa1038ef9e4d8a0b275b08671080ba5dc39a15 (patch) | |
| tree | 54bcab58debded0f48e9ea55218033435007221e /sys/dev/flash.c | |
| parent | Remove code to create a carp(4) Token Ring lladdr. (diff) | |
| download | wireguard-openbsd-27fa1038ef9e4d8a0b275b08671080ba5dc39a15.tar.xz wireguard-openbsd-27fa1038ef9e4d8a0b275b08671080ba5dc39a15.zip | |
Don't initialize d_partitions[RAW_DISK] just before calling
readdisklabel(), since all readdisklabel()'s do that already.
ok deraadt@
Diffstat (limited to 'sys/dev/flash.c')
| -rw-r--r-- | sys/dev/flash.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/flash.c b/sys/dev/flash.c index ed46c3f6c00..403091b9d48 100644 --- a/sys/dev/flash.c +++ b/sys/dev/flash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: flash.c,v 1.2 2007/02/15 00:53:26 krw Exp $ */ +/* $OpenBSD: flash.c,v 1.3 2007/06/01 00:07:48 krw Exp $ */ /* * Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org> @@ -1001,12 +1001,6 @@ flashgetdefaultlabel(dev_t dev, struct flash_softc *sc, lp->d_bbsize = BBSIZE; lp->d_sbsize = SBSIZE; - /* Fake the partition information. */ - lp->d_npartitions = RAW_PART + 1; - lp->d_partitions[RAW_PART].p_size = lp->d_secperunit; - lp->d_partitions[RAW_PART].p_offset = 0; - lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED; - /* Wrap it up. */ lp->d_magic = DISKMAGIC; lp->d_magic2 = DISKMAGIC; |