Reinstate $NetBSD$ headers (we want them for tracking purposes)

Sync with NetBSD 960217

4 files changed, 15 insertions, 10 deletions

diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h
index 8ce54854379..e0e31727fa9 100644
--- a/sys/miscfs/umapfs/umap.h
+++ b/sys/miscfs/umapfs/umap.h
@@ -1,4 +1,5 @@
-/*	$OpenBSD: umap.h,v 1.2 1996/02/26 07:20:03 mickey Exp $	*/
+/*	$OpenBSD: umap.h,v 1.3 1996/02/29 13:08:04 niklas Exp $	*/
+/*	$NetBSD: umap.h,v 1.6 1996/02/09 22:41:00 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c
index 68020176834..412294cd4c6 100644
--- a/sys/miscfs/umapfs/umap_subr.c
+++ b/sys/miscfs/umapfs/umap_subr.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: umap_subr.c,v 1.2 1996/02/26 07:20:07 mickey Exp $	*/
+/*	$OpenBSD: umap_subr.c,v 1.3 1996/02/29 13:08:05 niklas Exp $	*/
+/*	$NetBSD: umap_subr.c,v 1.7 1996/02/09 22:41:02 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -74,7 +75,7 @@ static int umap_node_alloc __P((struct mount *, struct vnode *,
 /*
  * Initialise cache headers
  */
-int
+void
 umapfs_init()
 {
 
@@ -433,7 +434,7 @@ umap_mapids(v_mount, credp)
 
 	for ( i = 0 ; credp->cr_groups[i] != 0 ; i++ ) {
 		gid = (gid_t) umap_findid(credp->cr_groups[i],
-					groupmap, gnentries);
+					  groupmap, gnentries);
 
 		if (gid != -1)
 			credp->cr_groups[i] = gid;
diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index 90b49a962a6..604347af58e 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/umapfs/umap_vfsops.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: umap_vfsops.c,v 1.2 1996/02/26 07:20:09 mickey Exp $	*/
+/*	$OpenBSD: umap_vfsops.c,v 1.3 1996/02/29 13:08:06 niklas Exp $	*/
+/*	$NetBSD: umap_vfsops.c,v 1.9 1996/02/09 22:41:05 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -101,7 +102,8 @@ umapfs_mount(mp, path, data, ndp, p)
 	/*
 	 * Get argument
 	 */
-	if (error = copyin(data, (caddr_t)&args, sizeof(struct umap_args)))
+	error = copyin(data, (caddr_t)&args, sizeof(struct umap_args));
+	if (error)
 		return (error);
 
 	/*
@@ -109,7 +111,7 @@ umapfs_mount(mp, path, data, ndp, p)
 	 */
 	NDINIT(ndp, LOOKUP, FOLLOW|WANTPARENT|LOCKLEAF,
 		UIO_USERSPACE, args.target, p);
-	if (error = namei(ndp))
+	if ((error = namei(ndp)) != 0)
 		return (error);
 
 	/*
@@ -264,7 +266,7 @@ umapfs_unmount(mp, mntflags, p)
 #endif
 	if (umapm_rootvp->v_usecount > 1 && !(flags & FORCECLOSE))
 		return (EBUSY);
-	if (error = vflush(mp, umapm_rootvp, flags))
+	if ((error = vflush(mp, umapm_rootvp, flags)) != 0)
 		return (error);
 
 #ifdef UMAPFS_DIAGNOSTIC
diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index c2787d12138..849cfb8cae5 100644
--- a/sys/miscfs/umapfs/umap_vnops.c
+++ b/sys/miscfs/umapfs/umap_vnops.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: umap_vnops.c,v 1.2 1996/02/26 07:20:12 mickey Exp $	*/
+/*	$OpenBSD: umap_vnops.c,v 1.3 1996/02/29 13:08:07 niklas Exp $	*/
+/*	$NetBSD: umap_vnops.c,v 1.5 1996/02/09 22:41:06 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -311,7 +312,7 @@ umap_getattr(v)
 	struct vnode **vp1p;
 	struct vnodeop_desc *descp = ap->a_desc;
 
-	if (error = umap_bypass(ap))
+	if ((error = umap_bypass(ap)) != 0)
 		return (error);
 	/* Requires that arguments be restored. */
 	ap->a_vap->va_fsid = ap->a_vp->v_mount->mnt_stat.f_fsid.val[0];