Date: Wed, 19 Aug 2020 07:28:01 +0000 (UTC) From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364373 - in head/sys: fs/cd9660 fs/fuse fs/nfsclient fs/smbfs fs/unionfs kern ufs/ufs Message-ID: <202008190728.07J7S1ZX032388@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mjg Date: Wed Aug 19 07:28:01 2020 New Revision: 364373 URL: https://svnweb.freebsd.org/changeset/base/364373 Log: vfs: remove the always-curthread td argument from VOP_RECLAIM Modified: head/sys/fs/cd9660/cd9660_node.c head/sys/fs/fuse/fuse_vnops.c head/sys/fs/nfsclient/nfs_clnode.c head/sys/fs/smbfs/smbfs_node.c head/sys/fs/unionfs/union_vnops.c head/sys/kern/uipc_mqueue.c head/sys/kern/vfs_subr.c head/sys/kern/vnode_if.src head/sys/ufs/ufs/ufs_inode.c Modified: head/sys/fs/cd9660/cd9660_node.c ============================================================================== --- head/sys/fs/cd9660/cd9660_node.c Wed Aug 19 02:51:17 2020 (r364372) +++ head/sys/fs/cd9660/cd9660_node.c Wed Aug 19 07:28:01 2020 (r364373) @@ -86,7 +86,6 @@ int cd9660_reclaim(ap) struct vop_reclaim_args /* { struct vnode *a_vp; - struct thread *a_td; } */ *ap; { struct vnode *vp = ap->a_vp; Modified: head/sys/fs/fuse/fuse_vnops.c ============================================================================== --- head/sys/fs/fuse/fuse_vnops.c Wed Aug 19 02:51:17 2020 (r364372) +++ head/sys/fs/fuse/fuse_vnops.c Wed Aug 19 07:28:01 2020 (r364373) @@ -1527,14 +1527,13 @@ out: /* struct vnop_reclaim_args { struct vnode *a_vp; - struct thread *a_td; }; */ static int fuse_vnop_reclaim(struct vop_reclaim_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 Wed Aug 19 02:51:17 2020 (r364372) +++ head/sys/fs/nfsclient/nfs_clnode.c Wed Aug 19 07:28:01 2020 (r364373) @@ -286,7 +286,10 @@ ncl_reclaim(struct vop_reclaim_args *ap) struct vnode *vp = ap->a_vp; struct nfsnode *np = VTONFS(vp); struct nfsdmap *dp, *dp2; + struct thread *td; + td = curthread; + /* * If the NLM is running, give it a chance to abort pending * locks. @@ -295,7 +298,7 @@ ncl_reclaim(struct vop_reclaim_args *ap) nfs_reclaim_p(ap); NFSLOCKNODE(np); - ncl_releasesillyrename(vp, ap->a_td); + ncl_releasesillyrename(vp, td); NFSUNLOCKNODE(np); if (NFS_ISV4(vp) && vp->v_type == VREG) @@ -305,7 +308,7 @@ ncl_reclaim(struct vop_reclaim_args *ap) * ncl_inactive(), but there are cases where it is not * called, so we need to do it again here. */ - (void) nfsrpc_close(vp, 1, ap->a_td); + (void) nfsrpc_close(vp, 1, td); vfs_hash_remove(vp); Modified: head/sys/fs/smbfs/smbfs_node.c ============================================================================== --- head/sys/fs/smbfs/smbfs_node.c Wed Aug 19 02:51:17 2020 (r364372) +++ head/sys/fs/smbfs/smbfs_node.c Wed Aug 19 07:28:01 2020 (r364373) @@ -260,7 +260,6 @@ int smbfs_reclaim(ap) struct vop_reclaim_args /* { struct vnode *a_vp; - struct thread *a_p; } */ *ap; { struct vnode *vp = ap->a_vp; Modified: head/sys/fs/unionfs/union_vnops.c ============================================================================== --- head/sys/fs/unionfs/union_vnops.c Wed Aug 19 02:51:17 2020 (r364372) +++ head/sys/fs/unionfs/union_vnops.c Wed Aug 19 07:28:01 2020 (r364373) @@ -1731,7 +1731,7 @@ unionfs_reclaim(struct vop_reclaim_args *ap) { /* UNIONFS_INTERNAL_DEBUG("unionfs_reclaim: enter\n"); */ - unionfs_noderem(ap->a_vp, ap->a_td); + unionfs_noderem(ap->a_vp, curthread); /* UNIONFS_INTERNAL_DEBUG("unionfs_reclaim: leave\n"); */ Modified: head/sys/kern/uipc_mqueue.c ============================================================================== --- head/sys/kern/uipc_mqueue.c Wed Aug 19 02:51:17 2020 (r364372) +++ head/sys/kern/uipc_mqueue.c Wed Aug 19 07:28:01 2020 (r364373) @@ -1099,7 +1099,6 @@ mqfs_inactive(struct vop_inactive_args *ap) struct vop_reclaim_args { struct vop_generic_args a_gen; struct vnode *a_vp; - struct thread *a_td; }; #endif Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Wed Aug 19 02:51:17 2020 (r364372) +++ head/sys/kern/vfs_subr.c Wed Aug 19 07:28:01 2020 (r364373) @@ -3879,7 +3879,7 @@ vgonel(struct vnode *vp) /* * Reclaim the vnode. */ - if (VOP_RECLAIM(vp, td)) + if (VOP_RECLAIM(vp)) panic("vgone: cannot reclaim"); if (mp != NULL) vn_finished_secondary_write(mp); Modified: head/sys/kern/vnode_if.src ============================================================================== --- head/sys/kern/vnode_if.src Wed Aug 19 02:51:17 2020 (r364372) +++ head/sys/kern/vnode_if.src Wed Aug 19 07:28:01 2020 (r364373) @@ -401,7 +401,6 @@ vop_need_inactive { vop_reclaim { IN struct vnode *vp; - IN struct thread *td; }; Modified: head/sys/ufs/ufs/ufs_inode.c ============================================================================== --- head/sys/ufs/ufs/ufs_inode.c Wed Aug 19 02:51:17 2020 (r364372) +++ head/sys/ufs/ufs/ufs_inode.c Wed Aug 19 07:28:01 2020 (r364373) @@ -222,7 +222,6 @@ int ufs_reclaim(ap) struct vop_reclaim_args /* { struct vnode *a_vp; - struct thread *a_td; } */ *ap; { struct vnode *vp = ap->a_vp;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008190728.07J7S1ZX032388>