diff --git a/kmod/src/Makefile.kernelcompat b/kmod/src/Makefile.kernelcompat index ebe68445..232ef1fa 100644 --- a/kmod/src/Makefile.kernelcompat +++ b/kmod/src/Makefile.kernelcompat @@ -6,16 +6,6 @@ ccflags-y += -include $(src)/kernelcompat.h -# -# v3.18-rc2-19-gb5ae6b15bd73 -# -# Folds d_materialise_unique into d_splice_alias. Note reversal -# of arguments (Also note Documentation/filesystems/porting.rst) -# -ifneq (,$(shell grep 'd_materialise_unique' include/linux/dcache.h)) -ccflags-y += -DKC_D_MATERIALISE_UNIQUE=1 -endif - # # RHEL extended the fop struct so to use it we have to set # a flag to indicate that the struct is large enough and diff --git a/kmod/src/dir.c b/kmod/src/dir.c index f9729d7d..2e482818 100644 --- a/kmod/src/dir.c +++ b/kmod/src/dir.c @@ -422,18 +422,7 @@ out: else inode = scoutfs_iget(sb, ino, 0, 0); - /* - * We can't splice dir aliases into the dcache. dir entries - * might have changed on other nodes so our dcache could still - * contain them, rather than having been moved in rename. For - * dirs, we use d_materialize_unique to remove any existing - * aliases which must be stale. Our inode numbers aren't reused - * so inodes pointed to by entries can't change types. - */ - if (!IS_ERR_OR_NULL(inode) && S_ISDIR(inode->i_mode)) - return d_materialise_unique(dentry, inode); - else - return d_splice_alias(inode, dentry); + return d_splice_alias(inode, dentry); } /* diff --git a/kmod/src/kernelcompat.h b/kmod/src/kernelcompat.h index 06855bf6..0442eb04 100644 --- a/kmod/src/kernelcompat.h +++ b/kmod/src/kernelcompat.h @@ -45,16 +45,6 @@ do { \ #define WQ_NON_REENTRANT 0 #endif -/* - * v3.18-rc2-19-gb5ae6b15bd73 - * - * Folds d_materialise_unique into d_splice_alias. Note reversal - * of arguments (Also note Documentation/filesystems/porting.rst) - */ -#ifndef KC_D_MATERIALISE_UNIQUE -#define d_materialise_unique(dentry, inode) d_splice_alias(inode, dentry) -#endif - /* * v4.8-rc1-29-g31051c85b5e2 *