d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfs: remove the always-curthread td argument from VOP_RECLAIM

Browse Source
This commit is contained in:
mjg 2020-08-19 07:28:01 +00:00
parent ecce8eaad7
commit 5a6c11283a
9 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/fs/cd9660/cd9660_node.c
View File

@ -86,7 +86,6 @@ int
cd9660_reclaim(ap) cd9660_reclaim(ap)
struct vop_reclaim_args /* { struct vop_reclaim_args /* {
struct vnode *a_vp; struct vnode *a_vp;
struct thread *a_td;
} */ *ap; } */ *ap;
{ {
struct vnode *vp = ap->a_vp; struct vnode *vp = ap->a_vp;

3
sys/fs/fuse/fuse_vnops.c
View File

@ -1527,14 +1527,13 @@ out:
/* /*
struct vnop_reclaim_args { struct vnop_reclaim_args {
struct vnode *a_vp; struct vnode *a_vp;
struct thread *a_td;
}; };
*/ */
static int static int
fuse_vnop_reclaim(struct vop_reclaim_args *ap) fuse_vnop_reclaim(struct vop_reclaim_args *ap)
{ {
struct vnode *vp = ap->a_vp; 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_vnode_data *fvdat = VTOFUD(vp);
struct fuse_filehandle *fufh, *fufh_tmp; struct fuse_filehandle *fufh, *fufh_tmp;

7
sys/fs/nfsclient/nfs_clnode.c
View File

@ -286,6 +286,9 @@ ncl_reclaim(struct vop_reclaim_args *ap)
struct vnode *vp = ap->a_vp; struct vnode *vp = ap->a_vp;
struct nfsnode *np = VTONFS(vp); struct nfsnode *np = VTONFS(vp);
struct nfsdmap *dp, *dp2; struct nfsdmap *dp, *dp2;
struct thread *td;
td = curthread;
/* /*
* If the NLM is running, give it a chance to abort pending * If the NLM is running, give it a chance to abort pending
@ -295,7 +298,7 @@ ncl_reclaim(struct vop_reclaim_args *ap)
nfs_reclaim_p(ap); nfs_reclaim_p(ap);
NFSLOCKNODE(np); NFSLOCKNODE(np);
ncl_releasesillyrename(vp, ap->a_td); ncl_releasesillyrename(vp, td);
NFSUNLOCKNODE(np); NFSUNLOCKNODE(np);
if (NFS_ISV4(vp) && vp->v_type == VREG) 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 * ncl_inactive(), but there are cases where it is not
* called, so we need to do it again here. * 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); vfs_hash_remove(vp);

1
sys/fs/smbfs/smbfs_node.c
View File

@ -260,7 +260,6 @@ int
smbfs_reclaim(ap) smbfs_reclaim(ap)
struct vop_reclaim_args /* { struct vop_reclaim_args /* {
struct vnode *a_vp; struct vnode *a_vp;
struct thread *a_p;
} */ *ap; } */ *ap;
{ {
struct vnode *vp = ap->a_vp; struct vnode *vp = ap->a_vp;

2
sys/fs/unionfs/union_vnops.c
View File

@ -1731,7 +1731,7 @@ unionfs_reclaim(struct vop_reclaim_args *ap)
{ {
/* UNIONFS_INTERNAL_DEBUG("unionfs_reclaim: enter\n"); */ /* 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"); */ /* UNIONFS_INTERNAL_DEBUG("unionfs_reclaim: leave\n"); */

1
sys/kern/uipc_mqueue.c
View File

@ -1099,7 +1099,6 @@ mqfs_inactive(struct vop_inactive_args *ap)
struct vop_reclaim_args { struct vop_reclaim_args {
struct vop_generic_args a_gen; struct vop_generic_args a_gen;
struct vnode *a_vp; struct vnode *a_vp;
struct thread *a_td;
}; };
#endif #endif

2
sys/kern/vfs_subr.c
View File

@ -3879,7 +3879,7 @@ vgonel(struct vnode *vp)
/* /*
* Reclaim the vnode. * Reclaim the vnode.
*/ */
if (VOP_RECLAIM(vp, td)) if (VOP_RECLAIM(vp))
panic("vgone: cannot reclaim"); panic("vgone: cannot reclaim");
if (mp != NULL) if (mp != NULL)
vn_finished_secondary_write(mp); vn_finished_secondary_write(mp);

1
sys/kern/vnode_if.src
View File

@ -401,7 +401,6 @@ vop_need_inactive {
vop_reclaim { vop_reclaim {
IN struct vnode *vp; IN struct vnode *vp;
IN struct thread *td;
}; };

1
sys/ufs/ufs/ufs_inode.c
View File

@ -222,7 +222,6 @@ int
ufs_reclaim(ap) ufs_reclaim(ap)
struct vop_reclaim_args /* { struct vop_reclaim_args /* {
struct vnode *a_vp; struct vnode *a_vp;
struct thread *a_td;
} */ *ap; } */ *ap;
{ {
struct vnode *vp = ap->a_vp; struct vnode *vp = ap->a_vp;