diff --git a/config/kernel-encode-fh-inode.m4 b/config/kernel-encode-fh-inode.m4
deleted file mode 100644
index b3ec040b5..000000000
--- a/config/kernel-encode-fh-inode.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-dnl #
-dnl # 3.5.0 API change
-dnl # torvalds/linux@b0b0382bb4904965a9e9fca77ad87514dfda0d1c changed the
-dnl # ->encode_fh() callback to pass the child inode and its parents inode
-dnl # rather than a dentry and a boolean saying whether we want the parent.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_ENCODE_FH_WITH_INODE], [
-	ZFS_LINUX_TEST_SRC([export_operations_encode_fh], [
-		#include <linux/exportfs.h>
-		static int encode_fh(struct inode *inode, __u32 *fh, int *max_len,
-		              struct inode *parent) { return 0; }
-		static struct export_operations eops __attribute__ ((unused))={
-			.encode_fh = encode_fh,
-		};
-	],[])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_ENCODE_FH_WITH_INODE], [
-	AC_MSG_CHECKING([whether eops->encode_fh() wants inode])
-	ZFS_LINUX_TEST_RESULT([export_operations_encode_fh], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_ENCODE_FH_WITH_INODE, 1,
-		    [eops->encode_fh() wants child and parent inodes])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
diff --git a/config/kernel.m4 b/config/kernel.m4
index 8b711e972..283102340 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -88,7 +88,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
 	ZFS_AC_KERNEL_SRC_PUT_LINK
 	ZFS_AC_KERNEL_SRC_TMPFILE
 	ZFS_AC_KERNEL_SRC_AUTOMOUNT
-	ZFS_AC_KERNEL_SRC_ENCODE_FH_WITH_INODE
 	ZFS_AC_KERNEL_SRC_COMMIT_METADATA
 	ZFS_AC_KERNEL_SRC_SETATTR_PREPARE
 	ZFS_AC_KERNEL_SRC_INSERT_INODE_LOCKED
@@ -236,7 +235,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
 	ZFS_AC_KERNEL_PUT_LINK
 	ZFS_AC_KERNEL_TMPFILE
 	ZFS_AC_KERNEL_AUTOMOUNT
-	ZFS_AC_KERNEL_ENCODE_FH_WITH_INODE
 	ZFS_AC_KERNEL_COMMIT_METADATA
 	ZFS_AC_KERNEL_SETATTR_PREPARE
 	ZFS_AC_KERNEL_INSERT_INODE_LOCKED
diff --git a/module/os/linux/zfs/zpl_export.c b/module/os/linux/zfs/zpl_export.c
index aa80b72e2..b6b9e2754 100644
--- a/module/os/linux/zfs/zpl_export.c
+++ b/module/os/linux/zfs/zpl_export.c
@@ -31,15 +31,8 @@
 
 
 static int
-#ifdef HAVE_ENCODE_FH_WITH_INODE
 zpl_encode_fh(struct inode *ip, __u32 *fh, int *max_len, struct inode *parent)
 {
-#else
-zpl_encode_fh(struct dentry *dentry, __u32 *fh, int *max_len, int connectable)
-{
-	/* CSTYLED */
-	struct inode *ip = dentry->d_inode;
-#endif /* HAVE_ENCODE_FH_WITH_INODE */
 	fstrans_cookie_t cookie;
 	ushort_t empty_fid = 0;
 	fid_t *fid;