diff options
| author | pjd <pjd@FreeBSD.org> | 2007-02-15 22:08:35 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2007-02-15 22:08:35 +0000 |
| commit | cb2d7c85a85791923bd76d6e730efe888d456b05 (patch) | |
| tree | d0649ac0ff4a69d709b0c801322ed78174e44d1c /sys/kern/vfs_init.c | |
| parent | 8442403943388cc79bc6f4b7d43bfe916ee194ef (diff) | |
| download | FreeBSD-src-cb2d7c85a85791923bd76d6e730efe888d456b05.zip FreeBSD-src-cb2d7c85a85791923bd76d6e730efe888d456b05.tar.gz | |
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
Diffstat (limited to 'sys/kern/vfs_init.c')
| -rw-r--r-- | sys/kern/vfs_init.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 143eaf5..7b2aeef 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -215,9 +215,13 @@ 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; |
