summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/spec_vnops.c4
-rw-r--r--sys/kern/vfs_bio.c14
-rw-r--r--sys/kern/vfs_cluster.c26
-rw-r--r--sys/kern/vnode_if.src4
4 files changed, 24 insertions, 24 deletions
diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c
index 23b86b9c1c8..4b8c38995a7 100644
--- a/sys/kern/spec_vnops.c
+++ b/sys/kern/spec_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spec_vnops.c,v 1.35 2006/07/12 19:56:18 thib Exp $ */
+/* $OpenBSD: spec_vnops.c,v 1.36 2006/10/16 11:27:53 pedro Exp $ */
/* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */
/*
@@ -236,7 +236,7 @@ spec_read(v)
register struct uio *uio = ap->a_uio;
struct proc *p = uio->uio_procp;
struct buf *bp;
- daddr_t bn, nextbn;
+ daddr64_t bn, nextbn;
long bsize, bscale, ssize;
struct partinfo dpart;
int n, on, majordev;
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 9517ca9e7bd..01ea582475c 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_bio.c,v 1.84 2006/08/28 16:15:29 tom Exp $ */
+/* $OpenBSD: vfs_bio.c,v 1.85 2006/10/16 11:27:53 pedro Exp $ */
/* $NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $ */
/*-
@@ -101,7 +101,7 @@ struct pool bufpool;
#define binsheadfree(bp, dp) TAILQ_INSERT_HEAD(dp, bp, b_freelist)
#define binstailfree(bp, dp) TAILQ_INSERT_TAIL(dp, bp, b_freelist)
-static __inline struct buf *bio_doread(struct vnode *, daddr_t, int, int);
+static __inline struct buf *bio_doread(struct vnode *, daddr64_t, int, int);
struct buf *getnewbuf(int, int, int *);
/*
@@ -232,7 +232,7 @@ bufinit(void)
}
static __inline struct buf *
-bio_doread(struct vnode *vp, daddr_t blkno, int size, int async)
+bio_doread(struct vnode *vp, daddr64_t blkno, int size, int async)
{
struct buf *bp;
@@ -261,7 +261,7 @@ bio_doread(struct vnode *vp, daddr_t blkno, int size, int async)
* This algorithm described in Bach (p.54).
*/
int
-bread(struct vnode *vp, daddr_t blkno, int size, struct ucred *cred,
+bread(struct vnode *vp, daddr64_t blkno, int size, struct ucred *cred,
struct buf **bpp)
{
struct buf *bp;
@@ -278,7 +278,7 @@ bread(struct vnode *vp, daddr_t blkno, int size, struct ucred *cred,
* Trivial modification to the breada algorithm presented in Bach (p.55).
*/
int
-breadn(struct vnode *vp, daddr_t blkno, int size, daddr_t rablks[],
+breadn(struct vnode *vp, daddr64_t blkno, int size, daddr64_t rablks[],
int rasizes[], int nrablks, struct ucred *cred, struct buf **bpp)
{
struct buf *bp;
@@ -571,7 +571,7 @@ brelse(struct buf *bp)
* chain. If it's there, return a pointer to it, unless it's marked invalid.
*/
struct buf *
-incore(struct vnode *vp, daddr_t blkno)
+incore(struct vnode *vp, daddr64_t blkno)
{
struct buf *bp;
@@ -594,7 +594,7 @@ incore(struct vnode *vp, daddr_t blkno)
* cached blocks be of the correct size.
*/
struct buf *
-getblk(struct vnode *vp, daddr_t blkno, int size, int slpflag, int slptimeo)
+getblk(struct vnode *vp, daddr64_t blkno, int size, int slpflag, int slptimeo)
{
struct bufhashhdr *bh;
struct buf *bp;
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index e00595107d9..d104ec12934 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_cluster.c,v 1.35 2006/10/03 19:49:06 pedro Exp $ */
+/* $OpenBSD: vfs_cluster.c,v 1.36 2006/10/16 11:27:53 pedro Exp $ */
/* $NetBSD: vfs_cluster.c,v 1.12 1996/04/22 01:39:05 christos Exp $ */
/*
@@ -45,10 +45,11 @@
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);
+struct buf *cluster_rbuild(struct vnode *, u_quad_t, struct buf *, daddr64_t,
daddr64_t, long, int, long);
-void cluster_wbuild(struct vnode *, struct buf *, long, daddr_t, int, daddr_t);
+void cluster_wbuild(struct vnode *, struct buf *, long, daddr64_t, int,
+ daddr64_t);
struct cluster_save *cluster_collectbufs(struct vnode *, struct cluster_info *,
struct buf *);
@@ -96,11 +97,10 @@ int doclusterraz = 0;
*/
int
cluster_read(struct vnode *vp, struct cluster_info *ci, u_quad_t filesize,
- daddr_t lblkno, long size, struct ucred *cred, struct buf **bpp)
+ daddr64_t lblkno, long size, struct ucred *cred, struct buf **bpp)
{
struct buf *bp, *rbp;
- daddr64_t blkno;
- daddr_t ioblkno;
+ daddr64_t blkno, ioblkno;
long flags;
int error, num_ra, alreadyincore;
@@ -260,11 +260,11 @@ skip_readahead:
*/
struct buf *
cluster_rbuild(struct vnode *vp, u_quad_t filesize, struct buf *bp,
- daddr_t lbn, daddr64_t blkno, long size, int run, long flags)
+ daddr64_t lbn, daddr64_t blkno, long size, int run, long flags)
{
struct cluster_save *b_save;
struct buf *tbp;
- daddr_t bn;
+ daddr64_t bn;
int i, inc;
#ifdef DIAGNOSTIC
@@ -359,7 +359,7 @@ cluster_rbuild(struct vnode *vp, u_quad_t filesize, struct buf *bp,
*/
struct buf *
cluster_newbuf(struct vnode *vp, struct buf *bp, long flags, daddr64_t blkno,
- daddr_t lblkno, long size, int run)
+ daddr64_t lblkno, long size, int run)
{
if (!bp) {
bp = getblk(vp, lblkno, size, 0, 0);
@@ -460,7 +460,7 @@ void
cluster_write(struct buf *bp, struct cluster_info *ci, u_quad_t filesize)
{
struct vnode *vp;
- daddr_t lbn;
+ daddr64_t lbn;
int maxclen, cursize;
vp = bp->b_vp;
@@ -568,7 +568,7 @@ cluster_write(struct buf *bp, struct cluster_info *ci, u_quad_t filesize)
*/
void
cluster_wbuild(struct vnode *vp, struct buf *last_bp, long size,
- daddr_t start_lbn, int len, daddr_t lbn)
+ daddr64_t start_lbn, int len, daddr64_t lbn)
{
struct cluster_save *b_save;
struct buf *bp, *tbp;
@@ -723,7 +723,7 @@ cluster_collectbufs(struct vnode *vp, struct cluster_info *ci,
struct buf *last_bp)
{
struct cluster_save *buflist;
- daddr_t lbn;
+ daddr64_t lbn;
int i, len;
len = ci->ci_lastw - ci->ci_cstart + 1;
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index f16274ee4fe..bc7422c1b37 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -1,4 +1,4 @@
-# $OpenBSD: vnode_if.src,v 1.30 2006/10/03 19:49:06 pedro Exp $
+# $OpenBSD: vnode_if.src,v 1.31 2006/10/16 11:27:53 pedro Exp $
# $NetBSD: vnode_if.src,v 1.10 1996/05/11 18:26:27 mycroft Exp $
#
# Copyright (c) 1992, 1993
@@ -396,7 +396,7 @@ vop_unlock {
vop_bmap {
IN SHOULDBELOCKED struct vnode *vp;
- IN daddr_t bn;
+ IN daddr64_t bn;
OUT struct vnode **vpp;
IN daddr64_t *bnp;
OUT int *runp;
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.