summaryrefslogtreecommitdiff
path: root/sbin/pdisk/partition_map.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2016-01-31 23:00:12 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2016-01-31 23:00:12 +0000
commitc2b9066dbf3485b3fea0009dc539285c0881132f (patch)
treef1491e9dccf48a806922ac4e1c07375521da101f /sbin/pdisk/partition_map.c
parent59951a45e8aa5cf7b3af4fc7621604654e6ea66b (diff)
Nuke pointless map field 'physical_block' and just use 'sbBlkSize' which is
set to the same value.
Diffstat (limited to 'sbin/pdisk/partition_map.c')
-rw-r--r--sbin/pdisk/partition_map.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sbin/pdisk/partition_map.c b/sbin/pdisk/partition_map.c
index 000fb32dcb1..9afae98c48e 100644
--- a/sbin/pdisk/partition_map.c
+++ b/sbin/pdisk/partition_map.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: partition_map.c,v 1.96 2016/01/31 22:26:52 krw Exp $ */
+/* $OpenBSD: partition_map.c,v 1.97 2016/01/31 23:00:11 krw Exp $ */
/*
* partition_map.c - partition map routines
@@ -72,7 +72,6 @@ open_partition_map(int fd, char *name, uint64_t mediasz, uint32_t sectorsz)
map->changed = 0;
LIST_INIT(&map->disk_order);
LIST_INIT(&map->base_order);
- map->physical_block = sectorsz;
map->blocks_in_map = 0;
map->maximum_in_map = -1;
@@ -272,14 +271,12 @@ create_partition_map(int fd, char *name, u_int64_t mediasz, uint32_t sectorsz)
LIST_INIT(&map->disk_order);
LIST_INIT(&map->base_order);
- map->physical_block = sectorsz;
-
map->blocks_in_map = 0;
map->maximum_in_map = -1;
map->media_size = mediasz;
map->sbSig = BLOCK0_SIGNATURE;
- map->sbBlkSize = map->physical_block;
+ map->sbBlkSize = sectorsz;
map->sbBlkCount = map->media_size;
entry = create_entry(map, 1, "", kFreeType, 1, mediasz - 1);