diff options
author | pjd <pjd@FreeBSD.org> | 2007-02-16 17:32:41 +0000 |
---|---|---|
committer | pjd <pjd@FreeBSD.org> | 2007-02-16 17:32:41 +0000 |
commit | a7213548bb4e900a339793a10287742fdff22e23 (patch) | |
tree | 3feaebd85a017ad78a5fe55b3bbd00e00cfb98e7 /sys/kern | |
parent | ed1bce702fd10f7ffb5f10660c8f343d6814dd59 (diff) | |
download | FreeBSD-src-a7213548bb4e900a339793a10287742fdff22e23.zip FreeBSD-src-a7213548bb4e900a339793a10287742fdff22e23.tar.gz |
Remove VFS_VPTOFH entirely. API is already broken and it is good time to
do it.
Suggested by: rwatson
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/vfs_default.c | 15 | ||||
-rw-r--r-- | sys/kern/vfs_init.c | 7 |
2 files changed, 1 insertions, 21 deletions
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index 92d920a..cc636a2 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -515,7 +515,7 @@ vop_stdputpages(ap) int vop_stdvptofh(struct vop_vptofh_args *ap) { - return VFS_VPTOFH(ap->a_vp, ap->a_fhp); + return (EOPNOTSUPP); } /* @@ -543,19 +543,6 @@ vfs_stdstatfs (mp, sbp, td) return (EOPNOTSUPP); } -#if __FreeBSD_version < 800000 -int -vfs_stdvptofh (vp, fhp) - struct vnode *vp; - struct fid *fhp; -{ - - return (EOPNOTSUPP); -} -#else -#error Remove this code, vfs_vptofh was replaced with vop_vptofh. -#endif - int vfs_stdquotactl (mp, cmds, uid, arg, td) struct mount *mp; diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 7b2aeef..3ce65ed 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -215,13 +215,6 @@ vfs_register(struct vfsconf *vfc) if (vfsops->vfs_checkexp == NULL) /* check if file system is exported */ vfsops->vfs_checkexp = vfs_stdcheckexp; -#if __FreeBSD_version < 800000 - if (vfsops->vfs_vptofh == NULL) - /* turn a vnode into an NFS file handle */ - vfsops->vfs_vptofh = vfs_stdvptofh; -#else -#error Remove this code, vfs_vptofh was replaced with vop_vptofh. -#endif if (vfsops->vfs_init == NULL) /* file system specific initialisation */ vfsops->vfs_init = vfs_stdinit; |