c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-27 03:19:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

config: remove HAVE_PUT_LINK_NAMEIDATA

Browse Source 
Sponsored-by: https://despairlabs.com/sponsor/
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes #16479
This commit is contained in:
Rob Norris 2024-08-04 13:58:24 +10:00 committed by Brian Behlendorf
parent 2bba420245
commit c9e8d0e0b5
2 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
config/kernel-put-link.m4
View File

@ -11,16 +11,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_PUT_LINK], [
.put_link = put_link, .put_link = put_link,
}; };
],[]) ],[])
ZFS_LINUX_TEST_SRC([put_link_nameidata], [
#include <linux/fs.h>
static void put_link(struct dentry *de, struct
nameidata *nd, void *ptr) { return; }
static struct inode_operations
iops __attribute__ ((unused)) = {
.put_link = put_link,
};
],[])
]) ])
AC_DEFUN([ZFS_AC_KERNEL_PUT_LINK], [ AC_DEFUN([ZFS_AC_KERNEL_PUT_LINK], [
@ -43,19 +33,7 @@ AC_DEFUN([ZFS_AC_KERNEL_PUT_LINK], [
[iops->put_link() cookie]) [iops->put_link() cookie])
],[ ],[
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
ZFS_LINUX_TEST_ERROR([put_link])
dnl #
dnl # 2.6.32 API
dnl #
AC_MSG_CHECKING(
[whether iops->put_link() passes nameidata])
ZFS_LINUX_TEST_RESULT([put_link_nameidata], [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_PUT_LINK_NAMEIDATA, 1,
[iops->put_link() nameidata])
],[
ZFS_LINUX_TEST_ERROR([put_link])
])
]) ])
]) ])
]) ])

11
module/os/linux/zfs/zpl_inode.c
View File

@ -653,15 +653,6 @@ zpl_put_link(struct inode *unused, void *cookie)
{ {
kmem_free(cookie, MAXPATHLEN); kmem_free(cookie, MAXPATHLEN);
} }
#elif defined(HAVE_PUT_LINK_NAMEIDATA)
static void
zpl_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
{
const char *link = nd_get_link(nd);
if (!IS_ERR(link))
kmem_free(link, MAXPATHLEN);
}
#elif defined(HAVE_PUT_LINK_DELAYED) #elif defined(HAVE_PUT_LINK_DELAYED)
static void static void
zpl_put_link(void *ptr) zpl_put_link(void *ptr)
@ -858,7 +849,7 @@ const struct inode_operations zpl_symlink_inode_operations = {
#elif defined(HAVE_FOLLOW_LINK_COOKIE) #elif defined(HAVE_FOLLOW_LINK_COOKIE)
.follow_link = zpl_follow_link, .follow_link = zpl_follow_link,
#endif #endif
#if defined(HAVE_PUT_LINK_COOKIE) || defined(HAVE_PUT_LINK_NAMEIDATA) #if defined(HAVE_PUT_LINK_COOKIE)
.put_link = zpl_put_link, .put_link = zpl_put_link,
#endif #endif
.setattr = zpl_setattr, .setattr = zpl_setattr,