diff options
| -rw-r--r-- | config/kernel-put-link.m4 | 24 | ||||
| -rw-r--r-- | module/os/linux/zfs/zpl_inode.c | 11 |
2 files changed, 2 insertions, 33 deletions
diff --git a/config/kernel-put-link.m4 b/config/kernel-put-link.m4 index 8ab318cbf..901024718 100644 --- a/config/kernel-put-link.m4 +++ b/config/kernel-put-link.m4 @@ -11,16 +11,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_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], [ @@ -43,19 +33,7 @@ AC_DEFUN([ZFS_AC_KERNEL_PUT_LINK], [ [iops->put_link() cookie]) ],[ AC_MSG_RESULT(no) - - 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]) - ]) + ZFS_LINUX_TEST_ERROR([put_link]) ]) ]) ]) diff --git a/module/os/linux/zfs/zpl_inode.c b/module/os/linux/zfs/zpl_inode.c index 1b7d06217..dfaaa6f1e 100644 --- a/module/os/linux/zfs/zpl_inode.c +++ b/module/os/linux/zfs/zpl_inode.c @@ -653,15 +653,6 @@ zpl_put_link(struct inode *unused, void *cookie) { 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) static void zpl_put_link(void *ptr) @@ -858,7 +849,7 @@ const struct inode_operations zpl_symlink_inode_operations = { #elif defined(HAVE_FOLLOW_LINK_COOKIE) .follow_link = zpl_follow_link, #endif -#if defined(HAVE_PUT_LINK_COOKIE) || defined(HAVE_PUT_LINK_NAMEIDATA) +#if defined(HAVE_PUT_LINK_COOKIE) .put_link = zpl_put_link, #endif .setattr = zpl_setattr, |