summaryrefslogtreecommitdiffstats
path: root/sys/fs/nullfs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/fs/nullfs')
-rw-r--r--sys/fs/nullfs/null_vfsops.c13
-rw-r--r--sys/fs/nullfs/null_vnops.c10
2 files changed, 10 insertions, 13 deletions
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 125c67a..7094cfb 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -63,7 +63,6 @@ static vfs_sync_t nullfs_sync;
static vfs_statfs_t nullfs_statfs;
static vfs_unmount_t nullfs_unmount;
static vfs_vget_t nullfs_vget;
-static vfs_vptofh_t nullfs_vptofh;
static vfs_extattrctl_t nullfs_extattrctl;
/*
@@ -344,17 +343,6 @@ nullfs_fhtovp(mp, fidp, vpp)
return (null_nodeget(mp, *vpp, vpp));
}
-static int
-nullfs_vptofh(vp, fhp)
- struct vnode *vp;
- struct fid *fhp;
-{
- struct vnode *lvp;
-
- lvp = NULLVPTOLOWERVP(vp);
- return VFS_VPTOFH(lvp, fhp);
-}
-
static int
nullfs_extattrctl(mp, cmd, filename_vp, namespace, attrname, td)
struct mount *mp;
@@ -381,7 +369,6 @@ static struct vfsops null_vfsops = {
.vfs_uninit = nullfs_uninit,
.vfs_unmount = nullfs_unmount,
.vfs_vget = nullfs_vget,
- .vfs_vptofh = nullfs_vptofh,
};
VFS_SET(null_vfsops, nullfs, VFCF_LOOPBACK);
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 4459fe1..fb20667 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -708,6 +708,15 @@ null_getwritemount(struct vop_getwritemount_args *ap)
return (0);
}
+static int
+null_vptofh(struct vop_vptofh_args *ap)
+{
+ struct vnode *lvp;
+
+ lvp = NULLVPTOLOWERVP(ap->a_vp);
+ return VOP_VPTOFH(lvp, ap->a_fhp);
+}
+
/*
* Global vfs data structures
*/
@@ -728,4 +737,5 @@ struct vop_vector null_vnodeops = {
.vop_setattr = null_setattr,
.vop_strategy = VOP_EOPNOTSUPP,
.vop_unlock = null_unlock,
+ .vop_vptofh = null_vptofh,
};
OpenPOWER on IntegriCloud