From ea102bbec1707f7a96577fbcc3f98e5ca729de69 Mon Sep 17 00:00:00 2001
From: tol <tol>
Date: Sun, 25 Nov 2007 00:12:04 +0000
Subject: [PATCH] (nnpfs_lookup): adapt to netbsd-4 locking changes. From Pavel
 Cahyna

---
 nnpfs/bsd/nnpfs_vnodeops-bsd.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nnpfs/bsd/nnpfs_vnodeops-bsd.c b/nnpfs/bsd/nnpfs_vnodeops-bsd.c
index fef851dab..ee9d285e0 100644
--- a/nnpfs/bsd/nnpfs_vnodeops-bsd.c
+++ b/nnpfs/bsd/nnpfs_vnodeops-bsd.c
@@ -288,8 +288,10 @@ nnpfs_lookup(struct vop_lookup_args * ap)
     nnpfs_vfs_context ctx;
     int error;
 
+#if !defined(__NetBSD__) || (__NetBSD_Version__ < 499000600 && __NetBSD_Version__ >= 49000000) | __NetBSD_Version__  < 400000002
     int lockparent = (cnp->cn_flags & (LOCKPARENT | ISLASTCN))
 	== (LOCKPARENT | ISLASTCN);
+#endif
 
     NNPFSDEB(XDEBVNOPS, ("nnpfs_lookup: (%s, %ld), nameiop = %lu, flags = %lu\n",
 		       cnp->cn_nameptr,
@@ -313,6 +315,7 @@ nnpfs_lookup(struct vop_lookup_args * ap)
     if (cnp->cn_nameiop != LOOKUP && cnp->cn_flags & ISLASTCN)
 	cnp->cn_flags |= SAVENAME;
 
+#if !defined(__NetBSD__) || (__NetBSD_Version__ < 499000600 && __NetBSD_Version__ >= 49000000) | __NetBSD_Version__  < 400000002
     if (error == 0 || error == EJUSTRETURN) {
 	if (ap->a_dvp == *(ap->a_vpp)) {
 	    /* if we looked up ourself, do nothing */
@@ -331,6 +334,7 @@ nnpfs_lookup(struct vop_lookup_args * ap)
     } else {
 	/* in case of a error do nothing  */
     } 
+#endif
     
     NNPFSDEB(XDEBVNOPS, ("nnpfs_lookup: error = %d\n", error));
 
-- 
2.11.4.GIT