Make daddr_t and u_daddr_t 64bits wide.

Retire daddr64_t and use daddr_t instead.

Sponsored by:	DARPA & NAI Labs.

3 files changed, 8 insertions, 8 deletions

diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c
index c47d309..3cb9d26 100644
--- a/sys/fs/coda/coda_vnops.c
+++ b/sys/fs/coda/coda_vnops.c
@@ -1693,7 +1693,7 @@ coda_bmap(v)
     struct vnode *vp __attribute__((unused)) = ap->a_vp;	/* file's vnode */
     daddr_t bn __attribute__((unused)) = ap->a_bn;	/* fs block number */
     struct vnode **vpp = ap->a_vpp;			/* RETURN vp of device */
-    daddr64_t *bnp __attribute__((unused)) = ap->a_bnp;	/* RETURN device block number */
+    daddr_t *bnp __attribute__((unused)) = ap->a_bnp;	/* RETURN device block number */
     struct thread *td __attribute__((unused)) = curthread;
 /* upcall decl */
 /* locals */
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index e9a4160..1f35f53 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1741,9 +1741,9 @@ static int
 msdosfs_bmap(ap)
 	struct vop_bmap_args /* {
 		struct vnode *a_vp;
-		daddr64_t a_bn;
+		daddr_t a_bn;
 		struct vnode **a_vpp;
-		daddr64_t *a_bnp;
+		daddr_t *a_bnp;
 		int *a_runp;
 		int *a_runb;
 	} */ *ap;
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index 9bf018a..3ae517c 100644
--- a/sys/fs/udf/udf_vnops.c
+++ b/sys/fs/udf/udf_vnops.c
@@ -63,7 +63,7 @@ static int udf_lookup(struct vop_cachedlookup_args *);
 static int udf_reclaim(struct vop_reclaim_args *);
 static void udf_dumpblock(void *, int) __unused;
 static int udf_readatoffset(struct udf_node *, int *, int, struct buf **, uint8_t **);
-static int udf_bmap_internal(struct udf_node *, uint32_t, daddr64_t *, uint32_t *);
+static int udf_bmap_internal(struct udf_node *, uint32_t, daddr_t *, uint32_t *);
 
 vop_t **udf_vnodeop_p;
 static struct vnodeopv_entry_desc udf_vnodeop_entries[] = {
@@ -799,7 +799,7 @@ udf_bmap(struct vop_bmap_args *a)
 {
 	struct udf_node *node;
 	uint32_t max_size;
-	daddr64_t lsector;
+	daddr_t lsector;
 	int error;
 
 	node = VTON(a->a_vp);
@@ -1084,7 +1084,7 @@ udf_readatoffset(struct udf_node *node, int *size, int offset, struct buf **bp,
 	struct file_entry *fentry = NULL;
 	struct buf *bp1;
 	uint32_t max_size;
-	daddr64_t sector;
+	daddr_t sector;
 	int error;
 
 	udfmp = node->udfmp;
@@ -1124,14 +1124,14 @@ udf_readatoffset(struct udf_node *node, int *size, int offset, struct buf **bp,
  * block.
  */
 static int
-udf_bmap_internal(struct udf_node *node, uint32_t offset, daddr64_t *sector, uint32_t *max_size)
+udf_bmap_internal(struct udf_node *node, uint32_t offset, daddr_t *sector, uint32_t *max_size)
 {
 	struct udf_mnt *udfmp;
 	struct file_entry *fentry;
 	void *icb;
 	struct icb_tag *tag;
 	uint32_t icblen = 0;
-	daddr64_t lsector;
+	daddr_t lsector;
 	int ad_offset, ad_num = 0;
 	int i, p_offset;