Remove VFS_VPTOFH entirely. API is already broken and it is good time to
do it. Suggested by: rwatson
This commit is contained in:
parent
eb62f84553
commit
2c7b0f41ec
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=166795
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -525,11 +525,6 @@ typedef int vfs_vget_t(struct mount *mp, ino_t ino, int flags,
|
||||
typedef int vfs_fhtovp_t(struct mount *mp, struct fid *fhp, struct vnode **vpp);
|
||||
typedef int vfs_checkexp_t(struct mount *mp, struct sockaddr *nam,
|
||||
int *extflagsp, struct ucred **credanonp);
|
||||
#if __FreeBSD_version < 800000
|
||||
typedef int vfs_vptofh_t(struct vnode *vp, struct fid *fhp);
|
||||
#else
|
||||
#error Remove this code, vfs_vptofh was replaced with vop_vptofh.
|
||||
#endif
|
||||
typedef int vfs_init_t(struct vfsconf *);
|
||||
typedef int vfs_uninit_t(struct vfsconf *);
|
||||
typedef int vfs_extattrctl_t(struct mount *mp, int cmd,
|
||||
@ -550,11 +545,6 @@ struct vfsops {
|
||||
vfs_vget_t *vfs_vget;
|
||||
vfs_fhtovp_t *vfs_fhtovp;
|
||||
vfs_checkexp_t *vfs_checkexp;
|
||||
#if __FreeBSD_version < 800000
|
||||
vfs_vptofh_t *vfs_vptofh;
|
||||
#else
|
||||
#error Remove this code, vfs_vptofh was replaced with vop_vptofh.
|
||||
#endif
|
||||
vfs_init_t *vfs_init;
|
||||
vfs_uninit_t *vfs_uninit;
|
||||
vfs_extattrctl_t *vfs_extattrctl;
|
||||
@ -574,11 +564,6 @@ vfs_statfs_t __vfs_statfs;
|
||||
(*(MP)->mnt_op->vfs_vget)(MP, INO, FLAGS, VPP)
|
||||
#define VFS_FHTOVP(MP, FIDP, VPP) \
|
||||
(*(MP)->mnt_op->vfs_fhtovp)(MP, FIDP, VPP)
|
||||
#if __FreeBSD_version < 800000
|
||||
#define VFS_VPTOFH(VP, FIDP) (*(VP)->v_mount->mnt_op->vfs_vptofh)(VP, FIDP)
|
||||
#else
|
||||
#error Remove this code, vfs_vptofh was replaced with vop_vptofh.
|
||||
#endif
|
||||
#define VFS_CHECKEXP(MP, NAM, EXFLG, CRED) \
|
||||
(*(MP)->mnt_op->vfs_checkexp)(MP, NAM, EXFLG, CRED)
|
||||
#define VFS_EXTATTRCTL(MP, C, FN, NS, N, P) \
|
||||
@ -705,11 +690,6 @@ vfs_sync_t vfs_stdnosync;
|
||||
vfs_vget_t vfs_stdvget;
|
||||
vfs_fhtovp_t vfs_stdfhtovp;
|
||||
vfs_checkexp_t vfs_stdcheckexp;
|
||||
#if __FreeBSD_version < 800000
|
||||
vfs_vptofh_t vfs_stdvptofh;
|
||||
#else
|
||||
#error Remove this code, vfs_vptofh was replaced with vop_vptofh.
|
||||
#endif
|
||||
vfs_init_t vfs_stdinit;
|
||||
vfs_uninit_t vfs_stduninit;
|
||||
vfs_extattrctl_t vfs_stdextattrctl;
|
||||
|
Loading…
Reference in New Issue
Block a user