diff options
| author |   marco <marco@openbsd.org> | 2007-04-22 00:41:31 +0000 |
|---|---|---|
| committer | marco <marco@openbsd.org> | 2007-04-22 00:41:31 +0000 |
| commit | c0a7912f1df55880a7c7cb7501daa83806e51777 (patch) | |
| tree | d1dd63eeb69cb2116d5b308b84ac852f0031daa4 /sys/dev/softraid.c | |
| parent | disable debug output here too. it's working fine (even on strange archs) (diff) | |
| download | wireguard-openbsd-c0a7912f1df55880a7c7cb7501daa83806e51777.tar.xz wireguard-openbsd-c0a7912f1df55880a7c7cb7501daa83806e51777.zip | |
Don't use SBLOCK_UFS1. Don't call it SKIP either.
Pompted by deraadt
Diffstat (limited to 'sys/dev/softraid.c')
| -rw-r--r-- | sys/dev/softraid.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index a7f59492ea4..ccf7b23ee38 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.30 2007/04/22 00:06:09 marco Exp $ */ +/* $OpenBSD: softraid.c,v 1.31 2007/04/22 00:41:31 marco Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * @@ -1004,7 +1004,7 @@ sr_parse_chunks(struct sr_softc *sc, char *lst, struct sr_chunk_head *cl) ss = name[strlen(name) - 1]; ch_entry->src_meta.scm_size = label.d_partitions[ss - 'a'].p_size - SR_META_SIZE - - SR_FFS_SKIP; + SR_META_OFFSET; if (ch_entry->src_meta.scm_size <= 0) { printf("%s: %s partition size = 0\n", DEVNAME(sc), name); @@ -1305,7 +1305,7 @@ sr_raid1_rw(struct sr_workunit *wu) else ios = sd->sd_vol.sv_meta.svm_no_chunk; - blk += SR_META_SIZE + SR_FFS_SKIP; + blk += SR_META_SIZE + SR_META_OFFSET; wu->swu_blk_start = blk; wu->swu_blk_end = blk + xs->datalen - 1; @@ -1853,7 +1853,7 @@ sr_save_metadata(struct sr_discipline *sd) continue; b.b_flags = B_WRITE; - b.b_blkno = SR_FFS_SKIP; /* skip past mbr and partition table */ + b.b_blkno = SR_META_OFFSET; b.b_bcount = sz; b.b_bufsize = sz; b.b_resid = sz; |