diff options
author | 2020-02-27 09:10:31 +0000 | |
---|---|---|
committer | 2020-02-27 09:10:31 +0000 | |
commit | db7aa9821c9615b2b21dc263b8e1f99309ff4e4a (patch) | |
tree | 0d64665fda5bf055faf179b3e286aa3b362761c4 /sys/ntfs/ntfs_vfsops.c | |
parent | Do not set A_JOIN unconditionally. Otherwise join "" takes effect even (diff) | |
download | wireguard-openbsd-db7aa9821c9615b2b21dc263b8e1f99309ff4e4a.tar.xz wireguard-openbsd-db7aa9821c9615b2b21dc263b8e1f99309ff4e4a.zip |
Remove unused "struct proc *" argument from the following functions:
- ufs_chown() & ufs_chmod()
- ufs_reclaim()
- ext2fs_chown() & ext2fs_chmod()
- ntfs_ntget() & ntfs_ntput()
- ntfs_vgetex(), ntfs_ntlookup() & ntfs_ntlookupfile()
While here use `ap->a_p' directly when it is only required to re-enter
the VFS layer in order to help reducing the loop.
ok visa@
Diffstat (limited to 'sys/ntfs/ntfs_vfsops.c')
-rw-r--r-- | sys/ntfs/ntfs_vfsops.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c index edeba10d332..efec7c0c741 100644 --- a/sys/ntfs/ntfs_vfsops.c +++ b/sys/ntfs/ntfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntfs_vfsops.c,v 1.63 2019/12/26 13:28:49 bluhm Exp $ */ +/* $OpenBSD: ntfs_vfsops.c,v 1.64 2020/02/27 09:10:31 mpi Exp $ */ /* $NetBSD: ntfs_vfsops.c,v 1.7 2003/04/24 07:50:19 christos Exp $ */ /*- @@ -628,7 +628,7 @@ ntfs_fhtovp(struct mount *mp, struct fid *fhp, struct vnode **vpp) mp->mnt_stat.f_mntonname, ntfhp->ntfid_ino); error = ntfs_vgetex(mp, ntfhp->ntfid_ino, ntfhp->ntfid_attr, NULL, - LK_EXCLUSIVE | LK_RETRY, 0, curproc, vpp); /* XXX */ + LK_EXCLUSIVE | LK_RETRY, 0, vpp); /* XXX */ if (error != 0) { *vpp = NULLVP; return (error); @@ -663,7 +663,7 @@ ntfs_vptofh(struct vnode *vp, struct fid *fhp) int ntfs_vgetex(struct mount *mp, ntfsino_t ino, u_int32_t attrtype, char *attrname, - u_long lkflags, u_long flags, struct proc *p, struct vnode **vpp) + u_long lkflags, u_long flags, struct vnode **vpp) { int error; struct ntfsmount *ntmp; @@ -679,7 +679,7 @@ ntfs_vgetex(struct mount *mp, ntfsino_t ino, u_int32_t attrtype, char *attrname, *vpp = NULL; /* Get ntnode */ - error = ntfs_ntlookup(ntmp, ino, &ip, p); + error = ntfs_ntlookup(ntmp, ino, &ip); if (error) { printf("ntfs_vget: ntfs_ntget failed\n"); return (error); @@ -691,7 +691,7 @@ ntfs_vgetex(struct mount *mp, ntfsino_t ino, u_int32_t attrtype, char *attrname, if(error) { printf("ntfs_vget: CAN'T LOAD ATTRIBUTES FOR INO: %d\n", ip->i_number); - ntfs_ntput(ip, p); + ntfs_ntput(ip); return (error); } @@ -700,7 +700,7 @@ ntfs_vgetex(struct mount *mp, ntfsino_t ino, u_int32_t attrtype, char *attrname, error = ntfs_fget(ntmp, ip, attrtype, attrname, &fp); if (error) { printf("ntfs_vget: ntfs_fget failed\n"); - ntfs_ntput(ip, p); + ntfs_ntput(ip); return (error); } @@ -718,7 +718,7 @@ ntfs_vgetex(struct mount *mp, ntfsino_t ino, u_int32_t attrtype, char *attrname, error = ntfs_filesize(ntmp, fp, &fp->f_size, &fp->f_allocated); if (error) { - ntfs_ntput(ip, p); + ntfs_ntput(ip); return (error); } @@ -734,7 +734,7 @@ ntfs_vgetex(struct mount *mp, ntfsino_t ino, u_int32_t attrtype, char *attrname, * ntfs_fget() bumped ntnode usecount, so ntnode won't be recycled * prematurely. */ - ntfs_ntput(ip, p); + ntfs_ntput(ip); if (FTOV(fp)) { /* vget() returns error if the vnode has been recycled */ @@ -747,7 +747,7 @@ ntfs_vgetex(struct mount *mp, ntfsino_t ino, u_int32_t attrtype, char *attrname, error = getnewvnode(VT_NTFS, ntmp->ntm_mountp, &ntfs_vops, &vp); if(error) { ntfs_frele(fp); - ntfs_ntput(ip, p); + ntfs_ntput(ip); return (error); } @@ -778,7 +778,7 @@ ntfs_vget(struct mount *mp, ino_t ino, struct vnode **vpp) if (ino > (ntfsino_t)-1) panic("ntfs_vget: alien ino_t %llu", (unsigned long long)ino); return ntfs_vgetex(mp, ino, NTFS_A_DATA, NULL, - LK_EXCLUSIVE | LK_RETRY, 0, curproc, vpp); /* XXX */ + LK_EXCLUSIVE | LK_RETRY, 0, vpp); /* XXX */ } const struct vfsops ntfs_vfsops = { |