diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-03 17:20:29 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-03 17:20:29 +0000 |
| commit | a69a4a568209bb69852224e2cd6f6394ed4da746 (patch) | |
| tree | 35d8778bf8e995cb348c0bb9d78d38b7a7e6e356 /sys/kern/vfs_cluster.c | |
| parent | 5aeba8440e8d2256e4b716030f97e3bf493b725a (diff) | |
From NetBSD: 960217 merge
Diffstat (limited to 'sys/kern/vfs_cluster.c')
| -rw-r--r-- | sys/kern/vfs_cluster.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 049dd716990..bfc48c8c0ca 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -1,4 +1,5 @@ -/* $NetBSD: vfs_cluster.c,v 1.8 1995/07/24 21:19:50 cgd Exp $ */ +/* $OpenBSD: vfs_cluster.c,v 1.2 1996/03/03 17:20:25 niklas Exp $ */ +/* $NetBSD: vfs_cluster.c,v 1.10 1996/02/09 19:00:56 christos Exp $ */ /*- * Copyright (c) 1993 @@ -42,8 +43,9 @@ #include <sys/mount.h> #include <sys/trace.h> #include <sys/malloc.h> +#include <sys/systm.h> #include <sys/resourcevar.h> -#include <lib/libkern/libkern.h> +#include <sys/cpu.h> #ifdef DEBUG #include <vm/vm.h> @@ -108,6 +110,7 @@ int doclusterraz = 0; * rbp is the read-ahead block. * If either is NULL, then you don't have to do the I/O. */ +int cluster_read(vp, filesize, lblkno, size, cred, bpp) struct vnode *vp; u_quad_t filesize; @@ -683,7 +686,7 @@ redo: * case we don't want to write it twice). */ if (!incore(vp, start_lbn) || - last_bp == NULL && start_lbn == lbn) + (last_bp == NULL && start_lbn == lbn)) break; /* |