Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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
This commit is contained in:
Pawel Jakub Dawidek 2021-11-12 17:06:44 -08:00 committed by Tony Hutter
parent 7100db9793
commit 70fdb198ad
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
module/os/freebsd/zfs/zfs_vnops_os.c
View File

@ -775,8 +775,8 @@ zfs_lookup_lock(vnode_t *dvp, vnode_t *vp, const char *name, int lkflags)
/* ARGSUSED */ /* ARGSUSED */
static int static int
zfs_lookup(vnode_t *dvp, const char *nm, vnode_t **vpp, zfs_lookup(vnode_t *dvp, const char *nm, vnode_t **vpp,
struct componentname *cnp, int nameiop, cred_t *cr, kthread_t *td, struct componentname *cnp, int nameiop, cred_t *cr, int flags,
int flags, boolean_t cached) boolean_t cached)
{ {
znode_t *zdp = VTOZ(dvp); znode_t *zdp = VTOZ(dvp);
znode_t *zp; znode_t *zp;
@ -1351,8 +1351,8 @@ zfs_lookup_internal(znode_t *dzp, const char *name, vnode_t **vpp,
a.a_cnp = cnp; a.a_cnp = cnp;
error = vfs_cache_lookup(&a); error = vfs_cache_lookup(&a);
} else { } else {
error = zfs_lookup(ZTOV(dzp), name, vpp, cnp, nameiop, kcred, error = zfs_lookup(ZTOV(dzp), name, vpp, cnp, nameiop, kcred, 0,
curthread, 0, B_FALSE); B_FALSE);
} }
#ifdef ZFS_DEBUG #ifdef ZFS_DEBUG
if (error) { if (error) {
@ -4570,7 +4570,7 @@ zfs_freebsd_lookup(struct vop_lookup_args *ap, boolean_t cached)
strlcpy(nm, cnp->cn_nameptr, MIN(cnp->cn_namelen + 1, sizeof (nm))); 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, 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 static int
@ -5271,7 +5271,7 @@ zfs_getextattr_dir(struct vop_getextattr_args *ap, const char *attrname)
vnode_t *xvp = NULL, *vp; vnode_t *xvp = NULL, *vp;
int error, flags; 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); LOOKUP_XATTR, B_FALSE);
if (error != 0) if (error != 0)
return (error); return (error);
@ -5380,18 +5380,17 @@ struct vop_deleteextattr {
static int static int
zfs_deleteextattr_dir(struct vop_deleteextattr_args *ap, const char *attrname) zfs_deleteextattr_dir(struct vop_deleteextattr_args *ap, const char *attrname)
{ {
struct thread *td = ap->a_td;
struct nameidata nd; struct nameidata nd;
vnode_t *xvp = NULL, *vp; vnode_t *xvp = NULL, *vp;
int error; 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); LOOKUP_XATTR, B_FALSE);
if (error != 0) if (error != 0)
return (error); return (error);
NDINIT_ATVP(&nd, DELETE, NOFOLLOW | LOCKPARENT | LOCKLEAF, NDINIT_ATVP(&nd, DELETE, NOFOLLOW | LOCKPARENT | LOCKLEAF,
UIO_SYSSPACE, attrname, xvp, td); UIO_SYSSPACE, attrname, xvp, ap->a_td);
error = namei(&nd); error = namei(&nd);
vp = nd.ni_vp; vp = nd.ni_vp;
if (error != 0) { if (error != 0) {
@ -5511,7 +5510,7 @@ zfs_setextattr_dir(struct vop_setextattr_args *ap, const char *attrname)
vnode_t *xvp = NULL, *vp; vnode_t *xvp = NULL, *vp;
int error, flags; 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); LOOKUP_XATTR | CREATE_XATTR_DIR, B_FALSE);
if (error != 0) if (error != 0)
return (error); return (error);
@ -5655,7 +5654,7 @@ zfs_listextattr_dir(struct vop_listextattr_args *ap, const char *attrprefix)
vnode_t *xvp = NULL, *vp; vnode_t *xvp = NULL, *vp;
int error, eof; 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); LOOKUP_XATTR, B_FALSE);
if (error != 0) { if (error != 0) {
/* /*