diff options
| author | Richard Yao <[email protected]> | 2022-09-02 16:20:10 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-09-02 13:20:10 -0700 |
| commit | 0b30dc484f7e70bc8bfe53fefc8581d181044efa (patch) | |
| tree | 84f10f742740d1fff4f79abcd65bf7762c372c6c /module/os/freebsd/zfs/zfs_vnops_os.c | |
| parent | 58e8054bce3f493cc1f38f7177cfdb942fa4deb9 (diff) | |
FreeBSD: Cleanup dead code from VFS
The vfs_*_feature() macros turn anything that uses them into dead code,
so we can delete all of it.
As a side effect, zfs_set_fuid_feature() is now identical in
module/os/freebsd/zfs/zfs_vnops_os.c and
module/os/linux/zfs/zfs_vnops_os.c. A few other functions are identical
too. Future cleanup could move these into a common file.
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Richard Yao <[email protected]>
Closes #13832
Diffstat (limited to 'module/os/freebsd/zfs/zfs_vnops_os.c')
| -rw-r--r-- | module/os/freebsd/zfs/zfs_vnops_os.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/module/os/freebsd/zfs/zfs_vnops_os.c b/module/os/freebsd/zfs/zfs_vnops_os.c index b46cc550c..f0579626c 100644 --- a/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/module/os/freebsd/zfs/zfs_vnops_os.c @@ -1672,7 +1672,6 @@ zfs_readdir(vnode_t *vp, zfs_uio_t *uio, cred_t *cr, int *eofp, int outcount; int error; uint8_t prefetch; - boolean_t check_sysattrs; uint8_t type; int ncooks; cookie_t *cooks = NULL; @@ -1756,19 +1755,6 @@ zfs_readdir(vnode_t *vp, zfs_uio_t *uio, cred_t *cr, int *eofp, *cookies = cooks; *ncookies = ncooks; } - /* - * If this VFS supports the system attribute view interface; and - * we're looking at an extended attribute directory; and we care - * about normalization conflicts on this vfs; then we must check - * for normalization conflicts with the sysattr name space. - */ -#ifdef TODO - check_sysattrs = vfs_has_feature(vp->v_vfsp, VFSFT_SYSATTR_VIEWS) && - (vp->v_flag & V_XATTRDIR) && zfsvfs->z_norm && - (flags & V_RDDIR_ENTFLAGS); -#else - check_sysattrs = 0; -#endif /* * Transform to file-system independent format @@ -1824,15 +1810,6 @@ zfs_readdir(vnode_t *vp, zfs_uio_t *uio, cred_t *cr, int *eofp, * uint8_t type = ZFS_DIRENT_TYPE(zap.za_first_integer); */ type = ZFS_DIRENT_TYPE(zap.za_first_integer); - - if (check_sysattrs && !zap.za_normalization_conflict) { -#ifdef TODO - zap.za_normalization_conflict = - xattr_sysattr_casechk(zap.za_name); -#else - panic("%s:%u: TODO", __func__, __LINE__); -#endif - } } if (flags & V_RDDIR_ACCFILTER) { |