Introduce daddr64_t and use it for physical block numbers

Okay weingart@, "I'm game with putting my name on it" dlg@

2 files changed, 15 insertions, 18 deletions

diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 0d5e311f1d6..e00595107d9 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_cluster.c,v 1.34 2005/11/08 15:43:44 pedro Exp $	*/
+/*	$OpenBSD: vfs_cluster.c,v 1.35 2006/10/03 19:49:06 pedro Exp $	*/
 /*	$NetBSD: vfs_cluster.c,v 1.12 1996/04/22 01:39:05 christos Exp $	*/
 
 /*
@@ -43,18 +43,14 @@
 
 #include <uvm/uvm_extern.h>
 
-/*
- * Local declarations
- */
-void	cluster_callback(struct buf *);
-struct buf *cluster_newbuf(struct vnode *, struct buf *, long, daddr_t,
-	    daddr_t, long, int);
-struct buf *cluster_rbuild(struct vnode *, u_quad_t, struct buf *,
-	    daddr_t, daddr_t, long, int, long);
-void	    cluster_wbuild(struct vnode *, struct buf *, long,
-	    daddr_t, int, daddr_t);
-struct cluster_save *cluster_collectbufs(struct vnode *, 
-	    struct cluster_info *, struct buf *);
+void cluster_callback(struct buf *);
+struct buf *cluster_newbuf(struct vnode *, struct buf *, long, daddr64_t,
+    daddr_t, long, int);
+struct buf *cluster_rbuild(struct vnode *, u_quad_t, struct buf *, daddr_t,
+    daddr64_t, long, int, long);
+void cluster_wbuild(struct vnode *, struct buf *, long, daddr_t, int, daddr_t);
+struct cluster_save *cluster_collectbufs(struct vnode *, struct cluster_info *,
+    struct buf *);
 
 #ifdef DIAGNOSTIC
 /*
@@ -103,7 +99,8 @@ cluster_read(struct vnode *vp, struct cluster_info *ci, u_quad_t filesize,
     daddr_t lblkno, long size, struct ucred *cred, struct buf **bpp)
 {
 	struct buf *bp, *rbp;
-	daddr_t blkno, ioblkno;
+	daddr64_t blkno;
+	daddr_t ioblkno;
 	long flags;
 	int error, num_ra, alreadyincore;
 
@@ -263,7 +260,7 @@ skip_readahead:
  */
 struct buf *
 cluster_rbuild(struct vnode *vp, u_quad_t filesize, struct buf *bp,
-    daddr_t lbn, daddr_t blkno, long size, int run, long flags)
+    daddr_t lbn, daddr64_t blkno, long size, int run, long flags)
 {
 	struct cluster_save *b_save;
 	struct buf *tbp;
@@ -361,7 +358,7 @@ cluster_rbuild(struct vnode *vp, u_quad_t filesize, struct buf *bp,
  * Either get a new buffer or grow the existing one.
  */
 struct buf *
-cluster_newbuf(struct vnode *vp, struct buf *bp, long flags, daddr_t blkno,
+cluster_newbuf(struct vnode *vp, struct buf *bp, long flags, daddr64_t blkno,
     daddr_t lblkno, long size, int run)
 {
 	if (!bp) {
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index 2fd111b4db8..f16274ee4fe 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -1,4 +1,4 @@
-#	$OpenBSD: vnode_if.src,v 1.29 2005/07/14 09:04:59 pedro Exp $
+#	$OpenBSD: vnode_if.src,v 1.30 2006/10/03 19:49:06 pedro Exp $
 #	$NetBSD: vnode_if.src,v 1.10 1996/05/11 18:26:27 mycroft Exp $
 #
 # Copyright (c) 1992, 1993
@@ -398,7 +398,7 @@ vop_bmap {
 	IN SHOULDBELOCKED struct vnode *vp;
 	IN daddr_t bn;
 	OUT struct vnode **vpp;
-	IN daddr_t *bnp;
+	IN daddr64_t *bnp;
 	OUT int *runp;
 };