diff options
author | Marco Peereboom <marco@cvs.openbsd.org> | 2007-05-23 21:27:14 +0000 |
---|---|---|
committer | Marco Peereboom <marco@cvs.openbsd.org> | 2007-05-23 21:27:14 +0000 |
commit | f293f85cb955f7ca9fefb4b8dff0343fadfc2ff7 (patch) | |
tree | 639b925f0339cef3dd755cc9a0a397ee0610bb51 /sys/dev/softraidvar.h | |
parent | 0d1a99c25d7246726c9a1255df1a2b277fee579c (diff) |
Remove all vnode dependencies so that we can bootstrap softraid volumes.
Code from tedu.
Replace all kernel string magic with dev_t passed in from bioctl.
Suggestion from beck and tedu. Help from miod.
Fix chunk crc.
ok tedu
Diffstat (limited to 'sys/dev/softraidvar.h')
-rw-r--r-- | sys/dev/softraidvar.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/softraidvar.h b/sys/dev/softraidvar.h index b8aed52dc47..9ecde9265fa 100644 --- a/sys/dev/softraidvar.h +++ b/sys/dev/softraidvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: softraidvar.h,v 1.17 2007/05/08 23:54:37 marco Exp $ */ +/* $OpenBSD: softraidvar.h,v 1.18 2007/05/23 21:27:13 marco Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <sro@peereboom.us> * @@ -116,6 +116,7 @@ TAILQ_HEAD(sr_wu_list, sr_workunit); #define SR_META_SIZE 32 /* save space at chunk beginning */ #define SR_META_OFFSET 16 /* skip 8192 bytes at chunk beginning */ #define SR_META_VERSION 1 /* bump when sr_metadata changes */ +#define SR_META_CRCSEED 0xdeadbeef /* seed for crc in metadata */ struct sr_metadata { /* do not change order of ssd_magic, ssd_version & ssd_checksum */ u_int64_t ssd_magic; /* magic id */ @@ -161,13 +162,12 @@ struct sr_chunk { struct sr_chunk_meta src_meta; /* chunk meta data */ /* runtime data */ - struct vnode *src_dev_vn; /* vnode */ dev_t src_dev_mm; /* major/minor */ /* helper members before metadata makes it onto the chunk */ int src_meta_ondisk;/* set when meta is on disk */ char src_devname[32]; - struct disklabel src_label; + quad_t src_size; SLIST_ENTRY(sr_chunk) src_link; }; |