summaryrefslogtreecommitdiff
path: root/sys/dev/softraidvar.h
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-06-06 17:15:15 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-06-06 17:15:15 +0000
commit64b0758a0244e515108eec4f2cd5d05a5939ebf1 (patch)
treee5e991586e626374ede95d07956bcaf6a47372be /sys/dev/softraidvar.h
parenta0f03208acbc7a85466c7cf68058959c1bbe9668 (diff)
now that all partition size/offsets are potentially 64-bit, change the
type of all variables to daddr64_t. this includes the APIs for XXsize() and XXdump(), all range checks inside bio drivers, internal variables for disklabel handling, and even uvm's swap offsets. re-read numerous times by otto, miod, krw, thib to look for errors
Diffstat (limited to 'sys/dev/softraidvar.h')
-rw-r--r--sys/dev/softraidvar.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/softraidvar.h b/sys/dev/softraidvar.h
index 65ce1549449..46be3692a8e 100644
--- a/sys/dev/softraidvar.h
+++ b/sys/dev/softraidvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraidvar.h,v 1.30 2007/06/02 00:53:35 marco Exp $ */
+/* $OpenBSD: softraidvar.h,v 1.31 2007/06/06 17:15:13 deraadt Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
*
@@ -196,8 +196,8 @@ struct sr_chunk_meta {
u_int32_t scm_status; /* use bio bioc_disk status */
u_int32_t scm_pad1;
char scm_devname[32];/* /dev/XXXXX */
- u_quad_t scm_size; /* size of partition */
- u_quad_t scm_coerced_size; /* coerced size of part */
+ int64_t scm_size; /* size of partition */
+ int64_t scm_coerced_size; /* coerced size of part */
struct sr_uuid scm_uuid; /* unique identifier */
} __packed;
@@ -210,7 +210,7 @@ struct sr_chunk {
/* helper members before metadata makes it onto the chunk */
int src_meta_ondisk;/* set when meta is on disk */
char src_devname[32];
- quad_t src_size;
+ int64_t src_size;
SLIST_ENTRY(sr_chunk) src_link;
};
@@ -224,7 +224,7 @@ struct sr_vol_meta {
u_int32_t svm_flags; /* flags */
#define SR_VOL_DIRTY 0x01
u_int32_t svm_level; /* raid level */
- u_quad_t svm_size; /* virtual disk size */
+ int64_t svm_size; /* virtual disk size */
char svm_devname[32];/* /dev/XXXXX */
char svm_vendor[8]; /* scsi vendor */
char svm_product[16];/* scsi product */