From owner-svn-src-all@freebsd.org Tue Oct 20 07:19:05 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 82565447D45; Tue, 20 Oct 2020 07:19:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CFlNn2xpRz3dPS; Tue, 20 Oct 2020 07:19:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 46D33111E5; Tue, 20 Oct 2020 07:19:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09K7J5lf074879; Tue, 20 Oct 2020 07:19:05 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09K7J39n074871; Tue, 20 Oct 2020 07:19:03 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202010200719.09K7J39n074871@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 20 Oct 2020 07:19:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366870 - in head/sys: contrib/openzfs/module/os/freebsd/zfs fs/cd9660 fs/ext2fs fs/fuse fs/nfsclient fs/smbfs kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: contrib/openzfs/module/os/freebsd/zfs fs/cd9660 fs/ext2fs fs/fuse fs/nfsclient fs/smbfs kern X-SVN-Commit-Revision: 366870 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 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: Tue, 20 Oct 2020 07:19:05 -0000 Author: mjg Date: Tue Oct 20 07:19:03 2020 New Revision: 366870 URL: https://svnweb.freebsd.org/changeset/base/366870 Log: vfs: drop the de facto curthread argument from VOP_INACTIVE Modified: head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c head/sys/fs/cd9660/cd9660_node.c head/sys/fs/ext2fs/ext2_inode.c head/sys/fs/fuse/fuse_vnops.c head/sys/fs/nfsclient/nfs_clnode.c head/sys/fs/smbfs/smbfs_node.c head/sys/kern/vfs_subr.c head/sys/kern/vnode_if.src Modified: head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c ============================================================================== --- head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c Tue Oct 20 07:18:27 2020 (r366869) +++ head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c Tue Oct 20 07:19:03 2020 (r366870) @@ -5821,7 +5821,7 @@ zfs_freebsd_inactive(struct vop_inactive_args *ap) { vnode_t *vp = ap->a_vp; - zfs_inactive(vp, ap->a_td->td_ucred, NULL); + zfs_inactive(vp, curthread->td_ucred, NULL); return (0); } @@ -5829,7 +5829,6 @@ zfs_freebsd_inactive(struct vop_inactive_args *ap) #ifndef _SYS_SYSPROTO_H_ struct vop_need_inactive_args { struct vnode *a_vp; - struct thread *a_td; }; #endif Modified: head/sys/fs/cd9660/cd9660_node.c ============================================================================== --- head/sys/fs/cd9660/cd9660_node.c Tue Oct 20 07:18:27 2020 (r366869) +++ head/sys/fs/cd9660/cd9660_node.c Tue Oct 20 07:19:03 2020 (r366870) @@ -63,7 +63,6 @@ int cd9660_inactive(ap) struct vop_inactive_args /* { struct vnode *a_vp; - struct thread *a_td; } */ *ap; { struct vnode *vp = ap->a_vp; Modified: head/sys/fs/ext2fs/ext2_inode.c ============================================================================== --- head/sys/fs/ext2fs/ext2_inode.c Tue Oct 20 07:18:27 2020 (r366869) +++ head/sys/fs/ext2fs/ext2_inode.c Tue Oct 20 07:19:03 2020 (r366870) @@ -593,7 +593,7 @@ ext2_inactive(struct vop_inactive_args *ap) { struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); - struct thread *td = ap->a_td; + struct thread *td = curthread; int mode, error = 0; /* Modified: head/sys/fs/fuse/fuse_vnops.c ============================================================================== --- head/sys/fs/fuse/fuse_vnops.c Tue Oct 20 07:18:27 2020 (r366869) +++ head/sys/fs/fuse/fuse_vnops.c Tue Oct 20 07:19:03 2020 (r366870) @@ -850,14 +850,13 @@ fake: /* struct vnop_inactive_args { struct vnode *a_vp; - struct thread *a_td; }; */ static int fuse_vnop_inactive(struct vop_inactive_args *ap) { struct vnode *vp = ap->a_vp; - struct thread *td = ap->a_td; + struct thread *td = curthread; struct fuse_vnode_data *fvdat = VTOFUD(vp); struct fuse_filehandle *fufh, *fufh_tmp; Modified: head/sys/fs/nfsclient/nfs_clnode.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clnode.c Tue Oct 20 07:18:27 2020 (r366869) +++ head/sys/fs/nfsclient/nfs_clnode.c Tue Oct 20 07:19:03 2020 (r366870) @@ -239,8 +239,10 @@ ncl_inactive(struct vop_inactive_args *ap) { struct vnode *vp = ap->a_vp; struct nfsnode *np; + struct thread *td; boolean_t retv; + td = curthread; if (NFS_ISV4(vp) && vp->v_type == VREG) { /* * Since mmap()'d files do I/O after VOP_CLOSE(), the NFSv4 @@ -256,14 +258,14 @@ ncl_inactive(struct vop_inactive_args *ap) } else retv = TRUE; if (retv == TRUE) { - (void)ncl_flush(vp, MNT_WAIT, ap->a_td, 1, 0); - (void)nfsrpc_close(vp, 1, ap->a_td); + (void)ncl_flush(vp, MNT_WAIT, td, 1, 0); + (void)nfsrpc_close(vp, 1, td); } } np = VTONFS(vp); NFSLOCKNODE(np); - ncl_releasesillyrename(vp, ap->a_td); + ncl_releasesillyrename(vp, td); /* * NMODIFIED means that there might be dirty/stale buffers Modified: head/sys/fs/smbfs/smbfs_node.c ============================================================================== --- head/sys/fs/smbfs/smbfs_node.c Tue Oct 20 07:18:27 2020 (r366869) +++ head/sys/fs/smbfs/smbfs_node.c Tue Oct 20 07:19:03 2020 (r366870) @@ -299,10 +299,9 @@ int smbfs_inactive(ap) struct vop_inactive_args /* { struct vnode *a_vp; - struct thread *a_td; } */ *ap; { - struct thread *td = ap->a_td; + struct thread *td = curthread; struct ucred *cred = td->td_ucred; struct vnode *vp = ap->a_vp; struct smbnode *np = VTOSMB(vp); Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Tue Oct 20 07:18:27 2020 (r366869) +++ head/sys/kern/vfs_subr.c Tue Oct 20 07:19:03 2020 (r366870) @@ -3524,7 +3524,7 @@ vinactivef(struct vnode *vp) vm_object_page_clean(obj, 0, 0, 0); VM_OBJECT_WUNLOCK(obj); } - VOP_INACTIVE(vp, curthread); + VOP_INACTIVE(vp); VI_LOCK(vp); VNASSERT(vp->v_iflag & VI_DOINGINACT, vp, ("vinactive: lost VI_DOINGINACT")); Modified: head/sys/kern/vnode_if.src ============================================================================== --- head/sys/kern/vnode_if.src Tue Oct 20 07:18:27 2020 (r366869) +++ head/sys/kern/vnode_if.src Tue Oct 20 07:19:03 2020 (r366870) @@ -397,7 +397,6 @@ vop_readlink { vop_inactive { IN struct vnode *vp; - IN struct thread *td; }; %! need_inactive debugpre vop_need_inactive_debugpre