From owner-svn-src-all@FreeBSD.ORG Fri Nov 26 11:37:36 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6114A106566C; Fri, 26 Nov 2010 11:37:36 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4C4378FC21; Fri, 26 Nov 2010 11:37:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAQBba9R037933; Fri, 26 Nov 2010 11:37:36 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAQBbauX037922; Fri, 26 Nov 2010 11:37:36 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201011261137.oAQBbauX037922@svn.freebsd.org> From: Konstantin Belousov Date: Fri, 26 Nov 2010 11:37:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215860 - in stable/8/sys: fs/cd9660 fs/coda fs/hpfs fs/msdosfs fs/nfsclient fs/ntfs gnu/fs/ext2fs gnu/fs/reiserfs nfsclient ufs/ufs X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Nov 2010 11:37:36 -0000 Author: kib Date: Fri Nov 26 11:37:35 2010 New Revision: 215860 URL: http://svn.freebsd.org/changeset/base/215860 Log: Partial MFC r215548: Remove printf()s in the vop_inactive and vop_reclaim() methods related to prtactive variable. The prtactive variable definition and declaration are kept in the stable branch to preserve the KPI and KBI. Modified: stable/8/sys/fs/cd9660/cd9660_node.c stable/8/sys/fs/coda/coda_vnops.c stable/8/sys/fs/hpfs/hpfs_vnops.c stable/8/sys/fs/msdosfs/msdosfs_denode.c stable/8/sys/fs/nfsclient/nfs_clnode.c stable/8/sys/fs/ntfs/ntfs_vnops.c stable/8/sys/gnu/fs/ext2fs/ext2_inode.c stable/8/sys/gnu/fs/reiserfs/reiserfs_inode.c stable/8/sys/nfsclient/nfs_node.c stable/8/sys/ufs/ufs/ufs_inode.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/fs/cd9660/cd9660_node.c ============================================================================== --- stable/8/sys/fs/cd9660/cd9660_node.c Fri Nov 26 11:11:48 2010 (r215859) +++ stable/8/sys/fs/cd9660/cd9660_node.c Fri Nov 26 11:37:35 2010 (r215860) @@ -69,9 +69,6 @@ cd9660_inactive(ap) struct iso_node *ip = VTOI(vp); int error = 0; - if (prtactive && vrefcnt(vp) != 0) - vprint("cd9660_inactive: pushing active", vp); - /* * If we are done with the inode, reclaim it * so that it can be reused immediately. @@ -93,8 +90,6 @@ cd9660_reclaim(ap) { struct vnode *vp = ap->a_vp; - if (prtactive && vrefcnt(vp) != 0) - vprint("cd9660_reclaim: pushing active", vp); /* * Destroy the vm object and flush associated pages. */ Modified: stable/8/sys/fs/coda/coda_vnops.c ============================================================================== --- stable/8/sys/fs/coda/coda_vnops.c Fri Nov 26 11:11:48 2010 (r215859) +++ stable/8/sys/fs/coda/coda_vnops.c Fri Nov 26 11:37:35 2010 (r215860) @@ -1548,9 +1548,6 @@ coda_reclaim(struct vop_reclaim_args *ap "%p, cp %p\n", vp, cp); } #endif - } else { - if (prtactive && vp->v_usecount != 0) - vprint("coda_reclaim: pushing active", vp); } cache_purge(vp); coda_free(VTOC(vp)); Modified: stable/8/sys/fs/hpfs/hpfs_vnops.c ============================================================================== --- stable/8/sys/fs/hpfs/hpfs_vnops.c Fri Nov 26 11:11:48 2010 (r215859) +++ stable/8/sys/fs/hpfs/hpfs_vnops.c Fri Nov 26 11:37:35 2010 (r215860) @@ -575,9 +575,6 @@ hpfs_inactive(ap) return (error); } - if (prtactive && vrefcnt(vp) != 0) - vprint("hpfs_inactive: pushing active", vp); - if (hp->h_flag & H_INVAL) { vrecycle(vp, ap->a_td); return (0); Modified: stable/8/sys/fs/msdosfs/msdosfs_denode.c ============================================================================== --- stable/8/sys/fs/msdosfs/msdosfs_denode.c Fri Nov 26 11:11:48 2010 (r215859) +++ stable/8/sys/fs/msdosfs/msdosfs_denode.c Fri Nov 26 11:37:35 2010 (r215860) @@ -548,8 +548,6 @@ msdosfs_reclaim(ap) dep, dep->de_Name, dep->de_refcnt); #endif - if (prtactive && vrefcnt(vp) != 0) - vprint("msdosfs_reclaim(): pushing active", vp); /* * Destroy the vm object and flush associated pages. */ @@ -586,9 +584,6 @@ msdosfs_inactive(ap) printf("msdosfs_inactive(): dep %p, de_Name[0] %x\n", dep, dep->de_Name[0]); #endif - if (prtactive && vrefcnt(vp) != 0) - vprint("msdosfs_inactive(): pushing active", vp); - /* * Ignore denodes related to stale file handles. */ Modified: stable/8/sys/fs/nfsclient/nfs_clnode.c ============================================================================== --- stable/8/sys/fs/nfsclient/nfs_clnode.c Fri Nov 26 11:11:48 2010 (r215859) +++ stable/8/sys/fs/nfsclient/nfs_clnode.c Fri Nov 26 11:37:35 2010 (r215860) @@ -190,8 +190,6 @@ ncl_inactive(struct vop_inactive_args *a struct vnode *vp = ap->a_vp; np = VTONFS(vp); - if (prtactive && vrefcnt(vp) != 0) - vprint("ncl_inactive: pushing active", vp); if (NFS_ISV4(vp) && vp->v_type == VREG) { /* @@ -233,9 +231,6 @@ ncl_reclaim(struct vop_reclaim_args *ap) struct nfsnode *np = VTONFS(vp); struct nfsdmap *dp, *dp2; - if (prtactive && vrefcnt(vp) != 0) - vprint("ncl_reclaim: pushing active", vp); - if (NFS_ISV4(vp) && vp->v_type == VREG) /* * Since mmap()'d files do I/O after VOP_CLOSE(), the NFSv4 Modified: stable/8/sys/fs/ntfs/ntfs_vnops.c ============================================================================== --- stable/8/sys/fs/ntfs/ntfs_vnops.c Fri Nov 26 11:11:48 2010 (r215859) +++ stable/8/sys/fs/ntfs/ntfs_vnops.c Fri Nov 26 11:37:35 2010 (r215860) @@ -82,8 +82,6 @@ static vop_fsync_t ntfs_fsync; static vop_pathconf_t ntfs_pathconf; static vop_vptofh_t ntfs_vptofh; -int ntfs_prtactive = 1; /* 1 => print out reclaim of active vnodes */ - /* * This is a noop, simply returning what one has been given. */ @@ -214,15 +212,12 @@ ntfs_inactive(ap) struct vnode *a_vp; } */ *ap; { - register struct vnode *vp = ap->a_vp; #ifdef NTFS_DEBUG - register struct ntnode *ip = VTONT(vp); + register struct ntnode *ip = VTONT(ap->a_vp); #endif - dprintf(("ntfs_inactive: vnode: %p, ntnode: %d\n", vp, ip->i_number)); - - if (ntfs_prtactive && vrefcnt(vp) != 0) - vprint("ntfs_inactive: pushing active", vp); + dprintf(("ntfs_inactive: vnode: %p, ntnode: %d\n", ap->a_vp, + ip->i_number)); /* XXX since we don't support any filesystem changes * right now, nothing more needs to be done @@ -246,9 +241,6 @@ ntfs_reclaim(ap) dprintf(("ntfs_reclaim: vnode: %p, ntnode: %d\n", vp, ip->i_number)); - if (ntfs_prtactive && vrefcnt(vp) != 0) - vprint("ntfs_reclaim: pushing active", vp); - /* * Destroy the vm object and flush associated pages. */ Modified: stable/8/sys/gnu/fs/ext2fs/ext2_inode.c ============================================================================== --- stable/8/sys/gnu/fs/ext2fs/ext2_inode.c Fri Nov 26 11:11:48 2010 (r215859) +++ stable/8/sys/gnu/fs/ext2fs/ext2_inode.c Fri Nov 26 11:37:35 2010 (r215860) @@ -472,8 +472,6 @@ ext2_inactive(ap) int mode, error = 0; ext2_discard_prealloc(ip); - if (prtactive && vrefcnt(vp) != 0) - vprint("ext2_inactive: pushing active", vp); /* * Ignore inodes related to stale file handles. @@ -513,8 +511,6 @@ ext2_reclaim(ap) struct inode *ip; struct vnode *vp = ap->a_vp; - if (prtactive && vrefcnt(vp) != 0) - vprint("ufs_reclaim: pushing active", vp); ip = VTOI(vp); if (ip->i_flag & IN_LAZYMOD) { ip->i_flag |= IN_MODIFIED; Modified: stable/8/sys/gnu/fs/reiserfs/reiserfs_inode.c ============================================================================== --- stable/8/sys/gnu/fs/reiserfs/reiserfs_inode.c Fri Nov 26 11:11:48 2010 (r215859) +++ stable/8/sys/gnu/fs/reiserfs/reiserfs_inode.c Fri Nov 26 11:37:35 2010 (r215860) @@ -114,8 +114,6 @@ reiserfs_inactive(struct vop_inactive_ar reiserfs_log(LOG_DEBUG, "deactivating inode used %d times\n", vp->v_usecount); - if (prtactive && vrefcnt(vp) != 0) - vprint("ReiserFS/reclaim: pushing active", vp); #if 0 /* Ignore inodes related to stale file handles. */ @@ -147,8 +145,6 @@ reiserfs_reclaim(struct vop_reclaim_args reiserfs_log(LOG_DEBUG, "reclaiming inode used %d times\n", vp->v_usecount); - if (prtactive && vrefcnt(vp) != 0) - vprint("ReiserFS/reclaim: pushing active", vp); ip = VTOI(vp); /* XXX Update this node (write to the disk) */ Modified: stable/8/sys/nfsclient/nfs_node.c ============================================================================== --- stable/8/sys/nfsclient/nfs_node.c Fri Nov 26 11:11:48 2010 (r215859) +++ stable/8/sys/nfsclient/nfs_node.c Fri Nov 26 11:37:35 2010 (r215860) @@ -193,8 +193,6 @@ nfs_inactive(struct vop_inactive_args *a struct thread *td = curthread; /* XXX */ np = VTONFS(ap->a_vp); - if (prtactive && vrefcnt(ap->a_vp) != 0) - vprint("nfs_inactive: pushing active", ap->a_vp); mtx_lock(&np->n_mtx); if (ap->a_vp->v_type != VDIR) { sp = np->n_sillyrename; @@ -228,9 +226,6 @@ nfs_reclaim(struct vop_reclaim_args *ap) struct nfsnode *np = VTONFS(vp); struct nfsdmap *dp, *dp2; - if (prtactive && vrefcnt(vp) != 0) - vprint("nfs_reclaim: pushing active", vp); - /* * If the NLM is running, give it a chance to abort pending * locks. Modified: stable/8/sys/ufs/ufs/ufs_inode.c ============================================================================== --- stable/8/sys/ufs/ufs/ufs_inode.c Fri Nov 26 11:11:48 2010 (r215859) +++ stable/8/sys/ufs/ufs/ufs_inode.c Fri Nov 26 11:37:35 2010 (r215860) @@ -79,8 +79,6 @@ ufs_inactive(ap) struct mount *mp; mp = NULL; - if (prtactive && vp->v_usecount != 0) - vprint("ufs_inactive: pushing active", vp); /* * Ignore inodes related to stale file handles. */ @@ -187,8 +185,6 @@ ufs_reclaim(ap) int i; #endif - if (prtactive && vp->v_usecount != 0) - vprint("ufs_reclaim: pushing active", vp); /* * Destroy the vm object and flush associated pages. */