diff options
| author | Pawel Jakub Dawidek <pawel@dawidek.net> | 2021-11-12 17:06:44 -0800 |
|---|---|---|
| committer | Tony Hutter <hutter2@llnl.gov> | 2021-12-13 13:22:47 -0800 |
| commit | b96737b83e040fc14a60dd264c72031ab5eb166f (patch) | |
| tree | 650234a72aeff656d30961b4c8a36c530ccc6725 | |
| parent | 4b7bfcf8a0fd53137f8b4320166bb47decf31d66 (diff) | |
Remove (now unused) td argument from zfs_lookup()
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Signed-off-by: Pawel Jakub Dawidek <pawel@dawidek.net>
Closes #12748
| -rw-r--r-- | module/os/freebsd/zfs/zfs_vnops_os.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/module/os/freebsd/zfs/zfs_vnops_os.c b/module/os/freebsd/zfs/zfs_vnops_os.c index 0a3c12219..d6b6c3446 100644 --- a/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/module/os/freebsd/zfs/zfs_vnops_os.c @@ -775,8 +775,8 @@ zfs_lookup_lock(vnode_t *dvp, vnode_t *vp, const char *name, int lkflags) /* ARGSUSED */ static int zfs_lookup(vnode_t *dvp, const char *nm, vnode_t **vpp, - struct componentname *cnp, int nameiop, cred_t *cr, kthread_t *td, - int flags, boolean_t cached) + struct componentname *cnp, int nameiop, cred_t *cr, int flags, + boolean_t cached) { znode_t *zdp = VTOZ(dvp); znode_t *zp; @@ -1351,8 +1351,8 @@ zfs_lookup_internal(znode_t *dzp, const char *name, vnode_t **vpp, a.a_cnp = cnp; error = vfs_cache_lookup(&a); } else { - error = zfs_lookup(ZTOV(dzp), name, vpp, cnp, nameiop, kcred, - curthread, 0, B_FALSE); + error = zfs_lookup(ZTOV(dzp), name, vpp, cnp, nameiop, kcred, 0, + B_FALSE); } #ifdef ZFS_DEBUG if (error) { @@ -4596,7 +4596,7 @@ zfs_freebsd_lookup(struct vop_lookup_args *ap, boolean_t cached) strlcpy(nm, cnp->cn_nameptr, MIN(cnp->cn_namelen + 1, sizeof (nm))); return (zfs_lookup(ap->a_dvp, nm, ap->a_vpp, cnp, cnp->cn_nameiop, - cnp->cn_cred, curthread, 0, cached)); + cnp->cn_cred, 0, cached)); } static int @@ -5348,7 +5348,7 @@ zfs_getextattr_dir(struct vop_getextattr_args *ap, const char *attrname) vnode_t *xvp = NULL, *vp; int error, flags; - error = zfs_lookup(ap->a_vp, NULL, &xvp, NULL, 0, ap->a_cred, td, + error = zfs_lookup(ap->a_vp, NULL, &xvp, NULL, 0, ap->a_cred, LOOKUP_XATTR, B_FALSE); if (error != 0) return (error); @@ -5457,18 +5457,17 @@ struct vop_deleteextattr { static int zfs_deleteextattr_dir(struct vop_deleteextattr_args *ap, const char *attrname) { - struct thread *td = ap->a_td; struct nameidata nd; vnode_t *xvp = NULL, *vp; int error; - error = zfs_lookup(ap->a_vp, NULL, &xvp, NULL, 0, ap->a_cred, td, + error = zfs_lookup(ap->a_vp, NULL, &xvp, NULL, 0, ap->a_cred, LOOKUP_XATTR, B_FALSE); if (error != 0) return (error); NDINIT_ATVP(&nd, DELETE, NOFOLLOW | LOCKPARENT | LOCKLEAF, - UIO_SYSSPACE, attrname, xvp, td); + UIO_SYSSPACE, attrname, xvp, ap->a_td); error = namei(&nd); vp = nd.ni_vp; if (error != 0) { @@ -5588,7 +5587,7 @@ zfs_setextattr_dir(struct vop_setextattr_args *ap, const char *attrname) vnode_t *xvp = NULL, *vp; int error, flags; - error = zfs_lookup(ap->a_vp, NULL, &xvp, NULL, 0, ap->a_cred, td, + error = zfs_lookup(ap->a_vp, NULL, &xvp, NULL, 0, ap->a_cred, LOOKUP_XATTR | CREATE_XATTR_DIR, B_FALSE); if (error != 0) return (error); @@ -5732,7 +5731,7 @@ zfs_listextattr_dir(struct vop_listextattr_args *ap, const char *attrprefix) vnode_t *xvp = NULL, *vp; int error, eof; - error = zfs_lookup(ap->a_vp, NULL, &xvp, NULL, 0, ap->a_cred, td, + error = zfs_lookup(ap->a_vp, NULL, &xvp, NULL, 0, ap->a_cred, LOOKUP_XATTR, B_FALSE); if (error != 0) { /* |