summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorcgd <cgd@NetBSD.org>1993-12-21 06:01:32 +0000
committercgd <cgd@NetBSD.org>1993-12-21 06:01:32 +0000
commite9a8e9c41de4970ea2ffaeca46e2add418b09be7 (patch)
tree451b1d3649bcd96588f4ce2e4ad3c4bc4ed70c19 /sys/dev
parentcd36241fbb4619c92e398258d906a952bdbf3ec8 (diff)
fix that last
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/vn.c10
-rw-r--r--sys/dev/vnd.c10
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/vn.c b/sys/dev/vn.c
index 1fe9f0cb3c1..09e257a37c8 100644
--- a/sys/dev/vn.c
+++ b/sys/dev/vn.c
@@ -191,7 +191,7 @@ vnstrategy(bp)
return;
}
bn = dbtob(bn);
-#ifdef BSD44
+#if (BSD > 199103)
bsize = vn->sc_vp->v_mount->mnt_stat.f_iosize;
#else
bsize = vn->sc_vp->v_mount->mnt_stat.f_bsize;
@@ -206,7 +206,7 @@ vnstrategy(bp)
nbp = getvnbuf();
off = bn % bsize;
sz = min(bsize - off, resid);
-#ifdef BSD44
+#if (BSD > 199103)
(void) VOP_BMAP(vn->sc_vp, bn / bsize, &vp, &nbn, NULL);
#else
(void) VOP_BMAP(vn->sc_vp, bn / bsize, &vp, &nbn);
@@ -232,9 +232,9 @@ vnstrategy(bp)
nbp->b_pfcent = (int) bp; /* XXX */
nbp->b_rcred = vn->sc_cred; /* XXX crdup? */
nbp->b_wcred = vn->sc_cred; /* XXX crdup? */
-#ifdef BSD44
nbp->b_dirtyoff = bp->b_dirtyoff;
nbp->b_dirtyend = bp->b_dirtyend;
+#if (BSD > 199103)
nbp->b_validoff = bp->b_validoff;
nbp->b_validend = bp->b_validend;
#endif
@@ -404,7 +404,7 @@ vnioctl(dev, cmd, data, flag, p)
* weed out directories, sockets, etc. so we don't
* have to worry about them.
*/
-#ifdef BSD44
+#if (BSD > 199103)
NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, vio->vn_file, p);
if (error = vn_open(&nd, FREAD|FWRITE, 0))
return(error);
@@ -488,7 +488,7 @@ vnthrottle(vn, vp)
struct vnode *vp;
{
#ifdef NFSCLIENT
-#ifdef BSD44
+#if (BSD > 199103)
extern int (**nfsv2_vnodeop_p)();
if (vp->v_op == nfsv2_vnodeop_p)
#else
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 1fe9f0cb3c1..09e257a37c8 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -191,7 +191,7 @@ vnstrategy(bp)
return;
}
bn = dbtob(bn);
-#ifdef BSD44
+#if (BSD > 199103)
bsize = vn->sc_vp->v_mount->mnt_stat.f_iosize;
#else
bsize = vn->sc_vp->v_mount->mnt_stat.f_bsize;
@@ -206,7 +206,7 @@ vnstrategy(bp)
nbp = getvnbuf();
off = bn % bsize;
sz = min(bsize - off, resid);
-#ifdef BSD44
+#if (BSD > 199103)
(void) VOP_BMAP(vn->sc_vp, bn / bsize, &vp, &nbn, NULL);
#else
(void) VOP_BMAP(vn->sc_vp, bn / bsize, &vp, &nbn);
@@ -232,9 +232,9 @@ vnstrategy(bp)
nbp->b_pfcent = (int) bp; /* XXX */
nbp->b_rcred = vn->sc_cred; /* XXX crdup? */
nbp->b_wcred = vn->sc_cred; /* XXX crdup? */
-#ifdef BSD44
nbp->b_dirtyoff = bp->b_dirtyoff;
nbp->b_dirtyend = bp->b_dirtyend;
+#if (BSD > 199103)
nbp->b_validoff = bp->b_validoff;
nbp->b_validend = bp->b_validend;
#endif
@@ -404,7 +404,7 @@ vnioctl(dev, cmd, data, flag, p)
* weed out directories, sockets, etc. so we don't
* have to worry about them.
*/
-#ifdef BSD44
+#if (BSD > 199103)
NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, vio->vn_file, p);
if (error = vn_open(&nd, FREAD|FWRITE, 0))
return(error);
@@ -488,7 +488,7 @@ vnthrottle(vn, vp)
struct vnode *vp;
{
#ifdef NFSCLIENT
-#ifdef BSD44
+#if (BSD > 199103)
extern int (**nfsv2_vnodeop_p)();
if (vp->v_op == nfsv2_vnodeop_p)
#else