Module Name: src
Committed By: riastradh
Date: Fri May 26 14:34:20 UTC 2017
Modified Files:
src/sys/fs/cd9660: cd9660_node.c
src/sys/fs/filecorefs: filecore_node.c
src/sys/fs/msdosfs: msdosfs_denode.c
src/sys/fs/nilfs: nilfs_vnops.c
src/sys/fs/ntfs: ntfs_vnops.c
src/sys/fs/smbfs: smbfs_node.c
src/sys/fs/udf: udf_vnops.c
src/sys/kern: vfs_subr.c
src/sys/nfs: nfs_node.c
src/sys/ufs/ext2fs: ext2fs_inode.c
src/sys/ufs/lfs: ulfs_inode.c
src/sys/ufs/ufs: ufs_inode.c
Log Message:
Eliminate crusty debugging sludge.
We have a mostly sane vnode lifecycle now. If this needs debugging,
it should be done once at the call site of VOP_RECLAIM.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/fs/cd9660/cd9660_node.c
cvs rdiff -u -r1.30 -r1.31 src/sys/fs/filecorefs/filecore_node.c
cvs rdiff -u -r1.55 -r1.56 src/sys/fs/msdosfs/msdosfs_denode.c
cvs rdiff -u -r1.36 -r1.37 src/sys/fs/nilfs/nilfs_vnops.c
cvs rdiff -u -r1.62 -r1.63 src/sys/fs/ntfs/ntfs_vnops.c
cvs rdiff -u -r1.56 -r1.57 src/sys/fs/smbfs/smbfs_node.c
cvs rdiff -u -r1.105 -r1.106 src/sys/fs/udf/udf_vnops.c
cvs rdiff -u -r1.466 -r1.467 src/sys/kern/vfs_subr.c
cvs rdiff -u -r1.121 -r1.122 src/sys/nfs/nfs_node.c
cvs rdiff -u -r1.87 -r1.88 src/sys/ufs/ext2fs/ext2fs_inode.c
cvs rdiff -u -r1.18 -r1.19 src/sys/ufs/lfs/ulfs_inode.c
cvs rdiff -u -r1.100 -r1.101 src/sys/ufs/ufs/ufs_inode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/cd9660/cd9660_node.c
diff -u src/sys/fs/cd9660/cd9660_node.c:1.37 src/sys/fs/cd9660/cd9660_node.c:1.38
--- src/sys/fs/cd9660/cd9660_node.c:1.37 Fri May 26 14:21:00 2017
+++ src/sys/fs/cd9660/cd9660_node.c Fri May 26 14:34:19 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_node.c,v 1.37 2017/05/26 14:21:00 riastradh Exp $ */
+/* $NetBSD: cd9660_node.c,v 1.38 2017/05/26 14:34:19 riastradh Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.37 2017/05/26 14:21:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.38 2017/05/26 14:34:19 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,8 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: cd9660_node.
#include <fs/cd9660/cd9660_mount.h>
#include <fs/cd9660/iso_rrip.h>
-extern int prtactive; /* 1 => print out reclaim of active vnodes */
-
struct pool cd9660_node_pool;
static u_int cd9660_chars2ui(const u_char *, int);
@@ -133,8 +131,6 @@ cd9660_reclaim(void *v)
VOP_UNLOCK(vp);
- if (prtactive && vp->v_usecount > 1)
- vprint("cd9660_reclaim: pushing active", vp);
/*
* Purge old data structures associated with the inode.
*/
Index: src/sys/fs/filecorefs/filecore_node.c
diff -u src/sys/fs/filecorefs/filecore_node.c:1.30 src/sys/fs/filecorefs/filecore_node.c:1.31
--- src/sys/fs/filecorefs/filecore_node.c:1.30 Fri May 26 14:21:00 2017
+++ src/sys/fs/filecorefs/filecore_node.c Fri May 26 14:34:19 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_node.c,v 1.30 2017/05/26 14:21:00 riastradh Exp $ */
+/* $NetBSD: filecore_node.c,v 1.31 2017/05/26 14:34:19 riastradh Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1994
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_node.c,v 1.30 2017/05/26 14:21:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_node.c,v 1.31 2017/05/26 14:34:19 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,8 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: filecore_nod
struct pool filecore_node_pool;
-extern int prtactive; /* 1 => print out reclaim of active vnodes */
-
static const struct genfs_ops filecore_genfsops = {
.gop_size = genfs_size,
};
@@ -246,9 +244,6 @@ filecore_reclaim(void *v)
VOP_UNLOCK(vp);
- if (prtactive && vp->v_usecount > 1)
- vprint("filecore_reclaim: pushing active", vp);
-
/*
* Purge old data structures associated with the inode.
*/
Index: src/sys/fs/msdosfs/msdosfs_denode.c
diff -u src/sys/fs/msdosfs/msdosfs_denode.c:1.55 src/sys/fs/msdosfs/msdosfs_denode.c:1.56
--- src/sys/fs/msdosfs/msdosfs_denode.c:1.55 Fri May 26 14:21:00 2017
+++ src/sys/fs/msdosfs/msdosfs_denode.c Fri May 26 14:34:19 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_denode.c,v 1.55 2017/05/26 14:21:00 riastradh Exp $ */
+/* $NetBSD: msdosfs_denode.c,v 1.56 2017/05/26 14:34:19 riastradh Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.55 2017/05/26 14:21:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.56 2017/05/26 14:34:19 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,8 +73,6 @@ __KERNEL_RCSID(0, "$NetBSD: msdosfs_deno
struct pool msdosfs_denode_pool;
-extern int prtactive;
-
struct fh_key {
struct msdosfsmount *fhk_mount;
uint32_t fhk_dircluster;
@@ -545,8 +543,6 @@ msdosfs_reclaim(void *v)
dep, dep->de_Name, dep->de_refcnt);
#endif
- if (prtactive && vp->v_usecount > 1)
- vprint("msdosfs_reclaim(): pushing active", vp);
/*
* Purge old data structures associated with the denode.
*/
Index: src/sys/fs/nilfs/nilfs_vnops.c
diff -u src/sys/fs/nilfs/nilfs_vnops.c:1.36 src/sys/fs/nilfs/nilfs_vnops.c:1.37
--- src/sys/fs/nilfs/nilfs_vnops.c:1.36 Fri May 26 14:21:00 2017
+++ src/sys/fs/nilfs/nilfs_vnops.c Fri May 26 14:34:19 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_vnops.c,v 1.36 2017/05/26 14:21:00 riastradh Exp $ */
+/* $NetBSD: nilfs_vnops.c,v 1.37 2017/05/26 14:34:19 riastradh Exp $ */
/*
* Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.36 2017/05/26 14:21:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.37 2017/05/26 14:34:19 riastradh Exp $");
#endif /* not lint */
@@ -61,9 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.
#define VTOI(vnode) ((struct nilfs_node *) (vnode)->v_data)
-/* externs */
-extern int prtactive;
-
/* implementations of vnode functions; table follows at end */
/* --------------------------------------------------------------------- */
@@ -108,8 +105,6 @@ nilfs_reclaim(void *v)
VOP_UNLOCK(vp);
DPRINTF(NODE, ("nilfs_reclaim called for node %p\n", nilfs_node));
- if (prtactive && vp->v_usecount > 1)
- vprint("nilfs_reclaim(): pushing active", vp);
if (nilfs_node == NULL) {
DPRINTF(NODE, ("nilfs_reclaim(): null nilfsnode\n"));
Index: src/sys/fs/ntfs/ntfs_vnops.c
diff -u src/sys/fs/ntfs/ntfs_vnops.c:1.62 src/sys/fs/ntfs/ntfs_vnops.c:1.63
--- src/sys/fs/ntfs/ntfs_vnops.c:1.62 Fri May 26 14:21:00 2017
+++ src/sys/fs/ntfs/ntfs_vnops.c Fri May 26 14:34:20 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_vnops.c,v 1.62 2017/05/26 14:21:00 riastradh Exp $ */
+/* $NetBSD: ntfs_vnops.c,v 1.63 2017/05/26 14:34:20 riastradh Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.62 2017/05/26 14:21:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.63 2017/05/26 14:34:20 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,8 +79,6 @@ static int ntfs_bmap(void *);
static int ntfs_fsync(void *);
static int ntfs_pathconf(void *);
-extern int prtactive;
-
/*
* This is a noop, simply returning what one has been given.
*/
@@ -243,9 +241,6 @@ ntfs_reclaim(void *v)
dprintf(("ntfs_reclaim: vnode: %p, ntnode: %llu\n", vp,
(unsigned long long)ip->i_number));
- if (prtactive && vp->v_usecount > 1)
- vprint("ntfs_reclaim: pushing active", vp);
-
if ((error = ntfs_ntget(ip)) != 0)
return (error);
Index: src/sys/fs/smbfs/smbfs_node.c
diff -u src/sys/fs/smbfs/smbfs_node.c:1.56 src/sys/fs/smbfs/smbfs_node.c:1.57
--- src/sys/fs/smbfs/smbfs_node.c:1.56 Fri May 26 14:21:01 2017
+++ src/sys/fs/smbfs/smbfs_node.c Fri May 26 14:34:20 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_node.c,v 1.56 2017/05/26 14:21:01 riastradh Exp $ */
+/* $NetBSD: smbfs_node.c,v 1.57 2017/05/26 14:34:20 riastradh Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_node.c,v 1.56 2017/05/26 14:21:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_node.c,v 1.57 2017/05/26 14:34:20 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,7 +63,6 @@ __KERNEL_RCSID(0, "$NetBSD: smbfs_node.c
#include <fs/smbfs/smbfs_subr.h>
extern int (**smbfs_vnodeop_p)(void *);
-extern int prtactive;
static const struct genfs_ops smbfs_genfsops = {
.gop_write = genfs_compat_gop_write,
@@ -224,9 +223,6 @@ smbfs_reclaim(void *v)
VOP_UNLOCK(vp);
- if (prtactive && vp->v_usecount > 1)
- vprint("smbfs_reclaim(): pushing active", vp);
-
SMBVDEBUG("%.*s,%d\n", (int) np->n_nmlen, np->n_name, vp->v_usecount);
dvp = (np->n_parent && (np->n_flag & NREFPARENT)) ?
Index: src/sys/fs/udf/udf_vnops.c
diff -u src/sys/fs/udf/udf_vnops.c:1.105 src/sys/fs/udf/udf_vnops.c:1.106
--- src/sys/fs/udf/udf_vnops.c:1.105 Fri May 26 14:21:01 2017
+++ src/sys/fs/udf/udf_vnops.c Fri May 26 14:34:20 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_vnops.c,v 1.105 2017/05/26 14:21:01 riastradh Exp $ */
+/* $NetBSD: udf_vnops.c,v 1.106 2017/05/26 14:34:20 riastradh Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.105 2017/05/26 14:21:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.106 2017/05/26 14:34:20 riastradh Exp $");
#endif /* not lint */
@@ -71,9 +71,6 @@ __KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,
static int udf_do_readlink(struct udf_node *udf_node, uint64_t filesize,
uint8_t *targetbuf, int *length);
-/* externs */
-extern int prtactive;
-
/* implementations of vnode functions; table follows at end */
/* --------------------------------------------------------------------- */
@@ -139,8 +136,6 @@ udf_reclaim(void *v)
VOP_UNLOCK(vp);
DPRINTF(NODE, ("udf_reclaim called for node %p\n", udf_node));
- if (prtactive && vp->v_usecount > 1)
- vprint("udf_reclaim(): pushing active", vp);
if (udf_node == NULL) {
DPRINTF(NODE, ("udf_reclaim(): null udfnode\n"));
Index: src/sys/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.466 src/sys/kern/vfs_subr.c:1.467
--- src/sys/kern/vfs_subr.c:1.466 Wed May 24 09:53:55 2017
+++ src/sys/kern/vfs_subr.c Fri May 26 14:34:19 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.466 2017/05/24 09:53:55 hannken Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.467 2017/05/26 14:34:19 riastradh Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.466 2017/05/24 09:53:55 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.467 2017/05/26 14:34:19 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -118,7 +118,6 @@ const int vttoif_tab[9] = {
}
int doforce = 1; /* 1 => permit forcible unmounting */
-int prtactive = 0; /* 1 => print out reclaim of active vnodes */
extern struct mount *dead_rootmount;
Index: src/sys/nfs/nfs_node.c
diff -u src/sys/nfs/nfs_node.c:1.121 src/sys/nfs/nfs_node.c:1.122
--- src/sys/nfs/nfs_node.c:1.121 Fri May 26 14:21:02 2017
+++ src/sys/nfs/nfs_node.c Fri May 26 14:34:20 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_node.c,v 1.121 2017/05/26 14:21:02 riastradh Exp $ */
+/* $NetBSD: nfs_node.c,v 1.122 2017/05/26 14:34:20 riastradh Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_node.c,v 1.121 2017/05/26 14:21:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_node.c,v 1.122 2017/05/26 14:34:20 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -64,8 +64,6 @@ struct pool nfs_node_pool;
struct pool nfs_vattr_pool;
static struct workqueue *nfs_sillyworkq;
-extern int prtactive;
-
static void nfs_gop_size(struct vnode *, off_t, off_t *, int);
static int nfs_gop_alloc(struct vnode *, off_t, off_t, int, kauth_cred_t);
static int nfs_gop_write(struct vnode *, struct vm_page **, int, int);
@@ -224,9 +222,6 @@ nfs_reclaim(void *v)
VOP_UNLOCK(vp);
- if (prtactive && vp->v_usecount > 1)
- vprint("nfs_reclaim: pushing active", vp);
-
/*
* Free up any directory cookie structures and
* large file handle structures that might be associated with
Index: src/sys/ufs/ext2fs/ext2fs_inode.c
diff -u src/sys/ufs/ext2fs/ext2fs_inode.c:1.87 src/sys/ufs/ext2fs/ext2fs_inode.c:1.88
--- src/sys/ufs/ext2fs/ext2fs_inode.c:1.87 Tue Apr 11 14:25:01 2017
+++ src/sys/ufs/ext2fs/ext2fs_inode.c Fri May 26 14:34:20 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_inode.c,v 1.87 2017/04/11 14:25:01 riastradh Exp $ */
+/* $NetBSD: ext2fs_inode.c,v 1.88 2017/05/26 14:34:20 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_inode.c,v 1.87 2017/04/11 14:25:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_inode.c,v 1.88 2017/05/26 14:34:20 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -82,8 +82,6 @@ __KERNEL_RCSID(0, "$NetBSD: ext2fs_inode
#include <ufs/ext2fs/ext2fs.h>
#include <ufs/ext2fs/ext2fs_extern.h>
-extern int prtactive;
-
static int ext2fs_indirtrunc(struct inode *, daddr_t, daddr_t,
daddr_t, int, long *);
@@ -198,8 +196,6 @@ ext2fs_inactive(void *v)
struct inode *ip = VTOI(vp);
int error = 0;
- if (prtactive && vp->v_usecount != 0)
- vprint("ext2fs_inactive: pushing active", vp);
/* Get rid of inodes related to stale file handles. */
if (ip->i_e2fs_mode == 0 || ip->i_e2fs_dtime != 0)
goto out;
Index: src/sys/ufs/lfs/ulfs_inode.c
diff -u src/sys/ufs/lfs/ulfs_inode.c:1.18 src/sys/ufs/lfs/ulfs_inode.c:1.19
--- src/sys/ufs/lfs/ulfs_inode.c:1.18 Tue Apr 11 14:25:01 2017
+++ src/sys/ufs/lfs/ulfs_inode.c Fri May 26 14:34:20 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_inode.c,v 1.18 2017/04/11 14:25:01 riastradh Exp $ */
+/* $NetBSD: ulfs_inode.c,v 1.19 2017/05/26 14:34:20 riastradh Exp $ */
/* from NetBSD: ufs_inode.c,v 1.95 2015/06/13 14:56:45 hannken Exp */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.18 2017/04/11 14:25:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.19 2017/05/26 14:34:20 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -71,8 +71,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c
#include <uvm/uvm.h>
-extern int prtactive;
-
/*
* Last reference to an inode. If necessary, write or delete it.
*/
@@ -136,9 +134,6 @@ ulfs_reclaim(struct vnode *vp)
{
struct inode *ip = VTOI(vp);
- if (prtactive && vp->v_usecount > 1)
- vprint("ulfs_reclaim: pushing active", vp);
-
/* XXX: do we really need two of these? */
/* note: originally the first was inside a wapbl txn */
lfs_update(vp, NULL, NULL, UPDATE_CLOSE);
Index: src/sys/ufs/ufs/ufs_inode.c
diff -u src/sys/ufs/ufs/ufs_inode.c:1.100 src/sys/ufs/ufs/ufs_inode.c:1.101
--- src/sys/ufs/ufs/ufs_inode.c:1.100 Tue Apr 11 14:25:01 2017
+++ src/sys/ufs/ufs/ufs_inode.c Fri May 26 14:34:20 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_inode.c,v 1.100 2017/04/11 14:25:01 riastradh Exp $ */
+/* $NetBSD: ufs_inode.c,v 1.101 2017/05/26 14:34:20 riastradh Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.100 2017/04/11 14:25:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.101 2017/05/26 14:34:20 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -69,8 +69,6 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,
#include <uvm/uvm.h>
-extern int prtactive;
-
/*
* Last reference to an inode. If necessary, write or delete it.
*/
@@ -162,9 +160,6 @@ ufs_reclaim(struct vnode *vp)
{
struct inode *ip = VTOI(vp);
- if (prtactive && vp->v_usecount > 1)
- vprint("ufs_reclaim: pushing active", vp);
-
if (!UFS_WAPBL_BEGIN(vp->v_mount)) {
UFS_UPDATE(vp, NULL, NULL, UPDATE_CLOSE);
UFS_WAPBL_END(vp->v_mount);
