Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

config: remove HAVE_3ARGS_VFS_GETATTR 

Sponsored-by: https://despairlabs.com/sponsor/
Signed-off-by: Rob Norris <robn@despairlabs.com>
This commit is contained in:
Rob Norris 2024-08-04 13:18:20 +10:00
parent c4a6db618d
commit 667c38eb1c
3 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
config/kernel-vfs-getattr.m4
View File

@ -48,39 +48,12 @@ AC_DEFUN([ZFS_AC_KERNEL_VFS_GETATTR_2ARGS], [
]) ])
]) ])
dnl #
dnl # <3.9 API
dnl # vfs_getattr(struct vfsmount *v, struct dentry *d, struct kstat *k)
dnl #
AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_GETATTR_3ARGS], [
ZFS_LINUX_TEST_SRC([vfs_getattr_3args], [
#include <linux/fs.h>
],[
vfs_getattr((struct vfsmount *)NULL,
(struct dentry *)NULL,
(struct kstat *)NULL);
])
])
AC_DEFUN([ZFS_AC_KERNEL_VFS_GETATTR_3ARGS], [
AC_MSG_CHECKING([whether vfs_getattr() wants 3 args])
ZFS_LINUX_TEST_RESULT([vfs_getattr_3args], [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_3ARGS_VFS_GETATTR, 1,
[vfs_getattr wants 3 args])
],[
AC_MSG_RESULT(no)
])
])
AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_GETATTR], [ AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_GETATTR], [
ZFS_AC_KERNEL_SRC_VFS_GETATTR_4ARGS ZFS_AC_KERNEL_SRC_VFS_GETATTR_4ARGS
ZFS_AC_KERNEL_SRC_VFS_GETATTR_2ARGS ZFS_AC_KERNEL_SRC_VFS_GETATTR_2ARGS
ZFS_AC_KERNEL_SRC_VFS_GETATTR_3ARGS
]) ])
AC_DEFUN([ZFS_AC_KERNEL_VFS_GETATTR], [ AC_DEFUN([ZFS_AC_KERNEL_VFS_GETATTR], [
ZFS_AC_KERNEL_VFS_GETATTR_4ARGS ZFS_AC_KERNEL_VFS_GETATTR_4ARGS
ZFS_AC_KERNEL_VFS_GETATTR_2ARGS ZFS_AC_KERNEL_VFS_GETATTR_2ARGS
ZFS_AC_KERNEL_VFS_GETATTR_3ARGS
]) ])

2
module/os/linux/spl/spl-generic.c
View File

@ -656,8 +656,6 @@ spl_getattr(struct file *filp, struct kstat *stat)
AT_STATX_SYNC_AS_STAT); AT_STATX_SYNC_AS_STAT);
#elif defined(HAVE_2ARGS_VFS_GETATTR) #elif defined(HAVE_2ARGS_VFS_GETATTR)
rc = vfs_getattr(&filp->f_path, stat); rc = vfs_getattr(&filp->f_path, stat);
#elif defined(HAVE_3ARGS_VFS_GETATTR)
rc = vfs_getattr(filp->f_path.mnt, filp->f_dentry, stat);
#else #else
#error "No available vfs_getattr()" #error "No available vfs_getattr()"
#endif #endif

2
module/os/linux/zfs/zfs_file_os.c
View File

@ -279,8 +279,6 @@ zfs_file_getattr(zfs_file_t *filp, zfs_file_attr_t *zfattr)
AT_STATX_SYNC_AS_STAT); AT_STATX_SYNC_AS_STAT);
#elif defined(HAVE_2ARGS_VFS_GETATTR) #elif defined(HAVE_2ARGS_VFS_GETATTR)
rc = vfs_getattr(&filp->f_path, &stat); rc = vfs_getattr(&filp->f_path, &stat);
#elif defined(HAVE_3ARGS_VFS_GETATTR)
rc = vfs_getattr(filp->f_path.mnt, filp->f_dentry, &stat);
#else #else
#error "No available vfs_getattr()" #error "No available vfs_getattr()"
#endif #endif