Module Name: src
Committed By: perseant
Date: Tue Aug 20 21:18:10 UTC 2019
Modified Files:
src/sbin/mount_umap: mount_umap.c
src/sys/miscfs/umapfs: umap.h
Log Message:
Clean up debugging cruft that somehow made it into my previous commit.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sbin/mount_umap/mount_umap.c
cvs rdiff -u -r1.18 -r1.19 src/sys/miscfs/umapfs/umap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/mount_umap/mount_umap.c
diff -u src/sbin/mount_umap/mount_umap.c:1.25 src/sbin/mount_umap/mount_umap.c:1.26
--- src/sbin/mount_umap/mount_umap.c:1.25 Tue Aug 20 21:07:21 2019
+++ src/sbin/mount_umap/mount_umap.c Tue Aug 20 21:18:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_umap.c,v 1.25 2019/08/20 21:07:21 wiz Exp $ */
+/* $NetBSD: mount_umap.c,v 1.26 2019/08/20 21:18:10 perseant Exp $ */
/*
* Copyright (c) 1992, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 19
#if 0
static char sccsid[] = "@(#)mount_umap.c 8.5 (Berkeley) 4/26/95";
#else
-__RCSID("$NetBSD: mount_umap.c,v 1.25 2019/08/20 21:07:21 wiz Exp $");
+__RCSID("$NetBSD: mount_umap.c,v 1.26 2019/08/20 21:18:10 perseant Exp $");
#endif
#endif /* not lint */
@@ -252,10 +252,6 @@ mount_umap(int argc, char *argv[])
args.gmapdata = gmapdata;
args.fsid = fsid;
- printf("sizeof export_args30 = %d, sizeof layer_args = %d, sizeof umap_args = %d\n",
- (int)sizeof(struct export_args30),
- (int)sizeof(struct layer_args),
- (int)sizeof(struct umap_args));
if (mount(MOUNT_UMAP, target, mntflags, &args, sizeof args) == -1)
err(1, "%s on %s", source, target);
if (mntflags & MNT_GETARGS) {
Index: src/sys/miscfs/umapfs/umap.h
diff -u src/sys/miscfs/umapfs/umap.h:1.18 src/sys/miscfs/umapfs/umap.h:1.19
--- src/sys/miscfs/umapfs/umap.h:1.18 Tue Aug 20 20:18:54 2019
+++ src/sys/miscfs/umapfs/umap.h Tue Aug 20 21:18:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umap.h,v 1.18 2019/08/20 20:18:54 perseant Exp $ */
+/* $NetBSD: umap.h,v 1.19 2019/08/20 21:18:10 perseant Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -95,11 +95,11 @@ void umap_mapids(struct mount *v_mount,
#define MOUNTTOUMAPMOUNT(mp) ((struct umap_mount *)((mp)->mnt_data))
#define VTOUMAP(vp) ((struct umap_node *)(vp)->v_data)
#define UMAPTOV(xp) ((xp)->umap_vnode)
-/* #ifdef UMAPFS_DIAGNOSTIC
+#ifdef UMAPFS_DIAGNOSTIC
#define UMAPVPTOLOWERVP(vp) layer_checkvp((vp), __FILE__, __LINE__)
-#else */
+#else
#define UMAPVPTOLOWERVP(vp) (VTOUMAP(vp)->umap_lowervp)
-/* #endif */
+#endif
extern int (**umap_vnodeop_p)(void *);
extern struct vfsops umapfs_vfsops;
