Date: Mon, 23 Apr 2012 14:10:34 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r234607 - in head/sys: cddl/contrib/opensolaris/uts/common/fs/zfs fs/cd9660 fs/ext2fs fs/hpfs fs/msdosfs fs/nullfs fs/smbfs fs/tmpfs fs/unionfs gnu/fs/reiserfs kern sys ufs/ufs Message-ID: <201204231410.q3NEAYhB001146@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Mon Apr 23 14:10:34 2012 New Revision: 234607 URL: http://svn.freebsd.org/changeset/base/234607 Log: Remove unused thread argument to vrecycle(). Reviewed by: kib Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c head/sys/fs/cd9660/cd9660_node.c head/sys/fs/ext2fs/ext2_inode.c head/sys/fs/hpfs/hpfs_vnops.c head/sys/fs/msdosfs/msdosfs_denode.c head/sys/fs/nullfs/null_vnops.c head/sys/fs/smbfs/smbfs_node.c head/sys/fs/tmpfs/tmpfs_vnops.c head/sys/fs/unionfs/union_vnops.c head/sys/gnu/fs/reiserfs/reiserfs_inode.c head/sys/kern/uipc_mqueue.c head/sys/kern/vfs_subr.c head/sys/sys/vnode.h head/sys/ufs/ufs/ufs_inode.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Mon Apr 23 13:34:12 2012 (r234606) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Mon Apr 23 14:10:34 2012 (r234607) @@ -4556,7 +4556,7 @@ zfs_inactive(vnode_t *vp, cred_t *cr, ca ASSERT(vp->v_count <= 1); vp->v_count = 0; VI_UNLOCK(vp); - vrecycle(vp, curthread); + vrecycle(vp); rw_exit(&zfsvfs->z_teardown_inactive_lock); return; } Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Mon Apr 23 13:34:12 2012 (r234606) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Mon Apr 23 14:10:34 2012 (r234607) @@ -1428,7 +1428,7 @@ zfs_zinactive(znode_t *zp) mutex_exit(&zp->z_lock); ZFS_OBJ_HOLD_EXIT(zfsvfs, z_id); ASSERT(vp->v_count == 0); - vrecycle(vp, curthread); + vrecycle(vp); vfslocked = VFS_LOCK_GIANT(zfsvfs->z_vfs); zfs_rmnode(zp); VFS_UNLOCK_GIANT(vfslocked); Modified: head/sys/fs/cd9660/cd9660_node.c ============================================================================== --- head/sys/fs/cd9660/cd9660_node.c Mon Apr 23 13:34:12 2012 (r234606) +++ head/sys/fs/cd9660/cd9660_node.c Mon Apr 23 14:10:34 2012 (r234607) @@ -65,7 +65,6 @@ cd9660_inactive(ap) } */ *ap; { struct vnode *vp = ap->a_vp; - struct thread *td = ap->a_td; struct iso_node *ip = VTOI(vp); int error = 0; @@ -74,7 +73,7 @@ cd9660_inactive(ap) * so that it can be reused immediately. */ if (ip->inode.iso_mode == 0) - vrecycle(vp, td); + vrecycle(vp); return error; } Modified: head/sys/fs/ext2fs/ext2_inode.c ============================================================================== --- head/sys/fs/ext2fs/ext2_inode.c Mon Apr 23 13:34:12 2012 (r234606) +++ head/sys/fs/ext2fs/ext2_inode.c Mon Apr 23 14:10:34 2012 (r234607) @@ -498,7 +498,7 @@ out: * so that it can be reused immediately. */ if (ip->i_mode == 0) - vrecycle(vp, td); + vrecycle(vp); return (error); } Modified: head/sys/fs/hpfs/hpfs_vnops.c ============================================================================== --- head/sys/fs/hpfs/hpfs_vnops.c Mon Apr 23 13:34:12 2012 (r234606) +++ head/sys/fs/hpfs/hpfs_vnops.c Mon Apr 23 14:10:34 2012 (r234607) @@ -576,7 +576,7 @@ hpfs_inactive(ap) } if (hp->h_flag & H_INVAL) { - vrecycle(vp, ap->a_td); + vrecycle(vp); return (0); } Modified: head/sys/fs/msdosfs/msdosfs_denode.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_denode.c Mon Apr 23 13:34:12 2012 (r234606) +++ head/sys/fs/msdosfs/msdosfs_denode.c Mon Apr 23 14:10:34 2012 (r234607) @@ -583,7 +583,6 @@ msdosfs_inactive(ap) { struct vnode *vp = ap->a_vp; struct denode *dep = VTODE(vp); - struct thread *td = ap->a_td; int error = 0; #ifdef MSDOSFS_DEBUG @@ -622,6 +621,6 @@ out: vrefcnt(vp), dep->de_Name[0]); #endif if (dep->de_Name[0] == SLOT_DELETED || dep->de_Name[0] == SLOT_EMPTY) - vrecycle(vp, td); + vrecycle(vp); return (error); } Modified: head/sys/fs/nullfs/null_vnops.c ============================================================================== --- head/sys/fs/nullfs/null_vnops.c Mon Apr 23 13:34:12 2012 (r234606) +++ head/sys/fs/nullfs/null_vnops.c Mon Apr 23 14:10:34 2012 (r234607) @@ -678,7 +678,6 @@ static int null_inactive(struct vop_inactive_args *ap) { struct vnode *vp = ap->a_vp; - struct thread *td = ap->a_td; vp->v_object = NULL; @@ -686,7 +685,7 @@ null_inactive(struct vop_inactive_args * * If this is the last reference, then free up the vnode * so as not to tie up the lower vnodes. */ - vrecycle(vp, td); + vrecycle(vp); return (0); } Modified: head/sys/fs/smbfs/smbfs_node.c ============================================================================== --- head/sys/fs/smbfs/smbfs_node.c Mon Apr 23 13:34:12 2012 (r234606) +++ head/sys/fs/smbfs/smbfs_node.c Mon Apr 23 14:10:34 2012 (r234607) @@ -373,7 +373,7 @@ smbfs_inactive(ap) smbfs_attr_cacheremove(vp); } if (np->n_flag & NGONE) - vrecycle(vp, td); + vrecycle(vp); return (0); } /* Modified: head/sys/fs/tmpfs/tmpfs_vnops.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_vnops.c Mon Apr 23 13:34:12 2012 (r234606) +++ head/sys/fs/tmpfs/tmpfs_vnops.c Mon Apr 23 14:10:34 2012 (r234607) @@ -1577,7 +1577,6 @@ static int tmpfs_inactive(struct vop_inactive_args *v) { struct vnode *vp = v->a_vp; - struct thread *l = v->a_td; struct tmpfs_node *node; @@ -1586,7 +1585,7 @@ tmpfs_inactive(struct vop_inactive_args node = VP_TO_TMPFS_NODE(vp); if (node->tn_links == 0) - vrecycle(vp, l); + vrecycle(vp); return 0; } Modified: head/sys/fs/unionfs/union_vnops.c ============================================================================== --- head/sys/fs/unionfs/union_vnops.c Mon Apr 23 13:34:12 2012 (r234606) +++ head/sys/fs/unionfs/union_vnops.c Mon Apr 23 14:10:34 2012 (r234607) @@ -1702,7 +1702,7 @@ static int unionfs_inactive(struct vop_inactive_args *ap) { ap->a_vp->v_object = NULL; - vrecycle(ap->a_vp, ap->a_td); + vrecycle(ap->a_vp); return (0); } Modified: head/sys/gnu/fs/reiserfs/reiserfs_inode.c ============================================================================== --- head/sys/gnu/fs/reiserfs/reiserfs_inode.c Mon Apr 23 13:34:12 2012 (r234606) +++ head/sys/gnu/fs/reiserfs/reiserfs_inode.c Mon Apr 23 14:10:34 2012 (r234607) @@ -104,12 +104,10 @@ reiserfs_inactive(struct vop_inactive_ar { int error; struct vnode *vp; - struct thread *td; struct reiserfs_node *ip; error = 0; vp = ap->a_vp; - td = ap->a_td; ip = VTOI(vp); reiserfs_log(LOG_DEBUG, "deactivating inode used %d times\n", @@ -129,7 +127,7 @@ out: */ if (ip->i_mode == 0) { reiserfs_log(LOG_DEBUG, "recyling\n"); - vrecycle(vp, td); + vrecycle(vp); } return (error); Modified: head/sys/kern/uipc_mqueue.c ============================================================================== --- head/sys/kern/uipc_mqueue.c Mon Apr 23 13:34:12 2012 (r234606) +++ head/sys/kern/uipc_mqueue.c Mon Apr 23 14:10:34 2012 (r234607) @@ -703,7 +703,7 @@ do_recycle(void *context, int pending __ { struct vnode *vp = (struct vnode *)context; - vrecycle(vp, curthread); + vrecycle(vp); vdrop(vp); } @@ -1065,7 +1065,7 @@ mqfs_inactive(struct vop_inactive_args * struct mqfs_node *pn = VTON(ap->a_vp); if (pn->mn_deleted) - vrecycle(ap->a_vp, ap->a_td); + vrecycle(ap->a_vp); return (0); } Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Mon Apr 23 13:34:12 2012 (r234606) +++ head/sys/kern/vfs_subr.c Mon Apr 23 14:10:34 2012 (r234607) @@ -2659,7 +2659,7 @@ loop: * Recycle an unused vnode to the front of the free list. */ int -vrecycle(struct vnode *vp, struct thread *td) +vrecycle(struct vnode *vp) { int recycled; Modified: head/sys/sys/vnode.h ============================================================================== --- head/sys/sys/vnode.h Mon Apr 23 13:34:12 2012 (r234606) +++ head/sys/sys/vnode.h Mon Apr 23 14:10:34 2012 (r234607) @@ -639,7 +639,7 @@ int vtruncbuf(struct vnode *vp, struct u void vunref(struct vnode *); void vn_printf(struct vnode *vp, const char *fmt, ...) __printflike(2,3); #define vprint(label, vp) vn_printf((vp), "%s\n", (label)) -int vrecycle(struct vnode *vp, struct thread *td); +int vrecycle(struct vnode *vp); int vn_close(struct vnode *vp, int flags, struct ucred *file_cred, struct thread *td); void vn_finished_write(struct mount *mp); Modified: head/sys/ufs/ufs/ufs_inode.c ============================================================================== --- head/sys/ufs/ufs/ufs_inode.c Mon Apr 23 13:34:12 2012 (r234606) +++ head/sys/ufs/ufs/ufs_inode.c Mon Apr 23 14:10:34 2012 (r234607) @@ -73,7 +73,6 @@ ufs_inactive(ap) { struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); - struct thread *td = ap->a_td; mode_t mode; int error = 0; off_t isize; @@ -172,7 +171,7 @@ out: * so that it can be reused immediately. */ if (ip->i_mode == 0) - vrecycle(vp, td); + vrecycle(vp); if (mp != NULL) vn_finished_secondary_write(mp); return (error);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204231410.q3NEAYhB001146>