Move vnode-to-file-handle translation from vfs_vptofh to vop_vptofh method.

This way we may support multiple structures in v_data vnode field within
one file system without using black magic.

Vnode-to-file-handle should be VOP in the first place, but was made VFS
operation to keep interface as compatible as possible with SUN's VFS.
BTW. Now Solaris also implements vnode-to-file-handle as VOP operation.

VFS_VPTOFH() was left for API backward compatibility, but is marked for
removal before 8.0-RELEASE.

Approved by:	mckusick
Discussed with:	many (on IRC)
Tested with:	ufs, msdosfs, cd9660, nullfs and zfs

1 files changed, 0 insertions, 13 deletions

diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index 694ce33..d40dd56 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -59,7 +59,6 @@ static vfs_quotactl_t		umapfs_quotactl;
 static vfs_statfs_t		umapfs_statfs;
 static vfs_unmount_t		umapfs_unmount;
 static vfs_fhtovp_t		umapfs_fhtovp;
-static vfs_vptofh_t		umapfs_vptofh;
 static vfs_checkexp_t		umapfs_checkexp;
 static vfs_vget_t		umapfs_vget;
 static vfs_extattrctl_t	umapfs_extattrctl;
@@ -384,17 +383,6 @@ umapfs_checkexp(mp, nam, exflagsp, credanonp)
 }
 
 static int
-umapfs_vptofh(vp, fhp)
-	struct vnode *vp;
-	struct fid *fhp;
-{
-	struct vnode *lvp;
-
-	lvp = UMAPVPTOLOWERVP(vp);
-	return (VFS_VPTOFH(lvp, fhp));
-}
-
-static int
 umapfs_extattrctl(mp, cmd, filename_vp, namespace, attrname, td)
 	struct mount *mp;
 	int cmd;
@@ -419,7 +407,6 @@ static struct vfsops umap_vfsops = {
 	.vfs_statfs =    		umapfs_statfs,
 	.vfs_unmount =   		umapfs_unmount,
 	.vfs_vget =      		umapfs_vget,
-	.vfs_vptofh =    		umapfs_vptofh,
 };
 
 VFS_SET(umap_vfsops, umapfs, VFCF_LOOPBACK);