aboutsummaryrefslogtreecommitdiff
path: root/sys/ufs/ufs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/ufs/ufs')
-rw-r--r--sys/ufs/ufs/ufs_extern.h2
-rw-r--r--sys/ufs/ufs/ufs_vfsops.c21
2 files changed, 6 insertions, 17 deletions
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index a28fcffabd2e..ab26750455e8 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -59,7 +59,7 @@ int ufs_bmap(struct vop_bmap_args *);
int ufs_bmaparray(struct vnode *, ufs2_daddr_t, ufs2_daddr_t *,
struct buf *, int *, int *);
int ufs_bmap_seekdata(struct vnode *, off_t *);
-int ufs_fhtovp(struct mount *, struct ufid *, int, struct vnode **);
+int ufs_fhtovp(struct mount *, struct vnode *, u_int64_t);
int ufs_checkpath(ino_t, ino_t, struct inode *, struct ucred *, ino_t *);
void ufs_dirbad(struct inode *, doff_t, char *);
int ufs_dirbadentry(struct vnode *, struct direct *, int);
diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c
index 4813ac7db763..1a63e92b3e2c 100644
--- a/sys/ufs/ufs/ufs_vfsops.c
+++ b/sys/ufs/ufs/ufs_vfsops.c
@@ -222,31 +222,20 @@ ufs_uninit(vfsp)
* Call the VFS_CHECKEXP beforehand to verify access.
*/
int
-ufs_fhtovp(mp, ufhp, flags, vpp)
+ufs_fhtovp(mp, nvp, gen)
struct mount *mp;
- struct ufid *ufhp;
- int flags;
- struct vnode **vpp;
+ struct vnode *nvp;
+ u_int64_t gen;
{
struct inode *ip;
- struct vnode *nvp;
- int error;
- error = VFS_VGET(mp, ufhp->ufid_ino, flags, &nvp);
- if (error) {
- *vpp = NULLVP;
- return (error);
- }
ip = VTOI(nvp);
- if (ip->i_mode == 0 || ip->i_gen != ufhp->ufid_gen ||
- ip->i_effnlink <= 0) {
+ if (ip->i_mode == 0 || ip->i_gen != gen || ip->i_effnlink <= 0) {
if (ip->i_mode == 0)
vgone(nvp);
vput(nvp);
- *vpp = NULLVP;
return (ESTALE);
}
- *vpp = nvp;
- vnode_create_vobject(*vpp, DIP(ip, i_size), curthread);
+ vnode_create_vobject(nvp, DIP(ip, i_size), curthread);
return (0);
}