aboutsummaryrefslogtreecommitdiff
path: root/sys/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys/sys')
-rw-r--r--sys/sys/bio.h6
-rw-r--r--sys/sys/buf.h4
-rw-r--r--sys/sys/types.h5
3 files changed, 7 insertions, 8 deletions
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index 778fe5f7c62e..61e53d707580 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -65,7 +65,7 @@ struct iodone_chain {
struct bio {
u_int bio_cmd; /* I/O operation. */
dev_t bio_dev; /* Device to do I/O on. */
- daddr64_t bio_blkno; /* Underlying physical block number. */
+ daddr_t bio_blkno; /* Underlying physical block number. */
off_t bio_offset; /* Offset into file. */
long bio_bcount; /* Valid bytes in buffer. */
caddr_t bio_data; /* Memory, superblocks, indirect etc. */
@@ -81,7 +81,7 @@ struct bio {
TAILQ_ENTRY(bio) bio_queue; /* Disksort queue. */
/* XXX: these go away when bio chaining is introduced */
- daddr64_t bio_pblkno; /* physical block number */
+ daddr_t bio_pblkno; /* physical block number */
struct iodone_chain *bio_done_chain;
struct bio *bio_linkage;
off_t bio_length;
@@ -135,7 +135,7 @@ biofinish(struct bio *bp, struct devstat *stat, int error)
struct bio_queue_head {
TAILQ_HEAD(bio_queue, bio) queue;
- daddr64_t last_pblkno;
+ daddr_t last_pblkno;
struct bio *insert_point;
struct bio *switch_point;
int busy;
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 3f0e259b9f21..0f6f579fd4b1 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -126,7 +126,7 @@ struct buf {
long b_runningbufspace; /* when I/O is running, pipelining */
caddr_t b_kvabase; /* base kva for buffer */
int b_kvasize; /* size of kva for buffer */
- daddr64_t b_lblkno; /* Logical block number. */
+ daddr_t b_lblkno; /* Logical block number. */
struct vnode *b_vp; /* Device vnode. */
int b_dirtyoff; /* Offset in buffer of dirty region. */
int b_dirtyend; /* Offset of end of dirty region. */
@@ -366,7 +366,7 @@ BUF_REFCNT(struct buf *bp)
struct buf_queue_head {
TAILQ_HEAD(buf_queue, buf) queue;
- daddr64_t last_pblkno;
+ daddr_t last_pblkno;
struct buf *insert_point;
struct buf *switch_point;
};
diff --git a/sys/sys/types.h b/sys/sys/types.h
index 17ac8e03fa8f..4811b0aed5e2 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -126,9 +126,8 @@ typedef quad_t * qaddr_t;
typedef char * caddr_t; /* core address */
typedef __const char * c_caddr_t; /* core address, pointer to const */
typedef __volatile char *v_caddr_t; /* core address, pointer to volatile */
-typedef int32_t daddr_t; /* disk address */
-typedef int64_t daddr64_t; /* 64-bit disk address */
-typedef u_int32_t u_daddr_t; /* unsigned disk address */
+typedef int64_t daddr_t; /* disk address */
+typedef u_int64_t u_daddr_t; /* unsigned disk address */
typedef u_int32_t fixpt_t; /* fixed point number */
#ifdef _BSD_GID_T_