diff --git a/kmod/src/Makefile.kernelcompat b/kmod/src/Makefile.kernelcompat index 6be7d359..89de420c 100644 --- a/kmod/src/Makefile.kernelcompat +++ b/kmod/src/Makefile.kernelcompat @@ -178,13 +178,6 @@ ifneq (,$(shell grep 'struct file.*bdev_file_open_by_path.const char.*path' incl ccflags-y += -DKC_BDEV_FILE_OPEN_BY_PATH endif -# v4.0-rc7-1796-gfe0f07d08ee3 -# -# direct-io changes modify inode_dio_done to now be called inode_dio_end -ifneq (,$(shell grep 'void inode_dio_end.struct inode' include/linux/fs.h)) -ccflags-y += -DKC_INODE_DIO_END -endif - # # v5.0-6476-g3d3539018d2c # diff --git a/kmod/src/data.c b/kmod/src/data.c index c0cc6591..1d233222 100644 --- a/kmod/src/data.c +++ b/kmod/src/data.c @@ -2215,7 +2215,7 @@ retry: out: if (scoutfs_per_task_del(&si->pt_data_lock, &pt_ent)) - kc_inode_dio_end(inode); + inode_dio_end(inode); scoutfs_unlock(sb, inode_lock, SCOUTFS_LOCK_READ); if (scoutfs_data_wait_found(&dw)) { err = scoutfs_data_wait(inode, &dw); diff --git a/kmod/src/kernelcompat.h b/kmod/src/kernelcompat.h index 2c4ca6fb..c81e79b0 100644 --- a/kmod/src/kernelcompat.h +++ b/kmod/src/kernelcompat.h @@ -184,12 +184,6 @@ static inline int kc_tcp_sock_set_nodelay(struct socket *sock) } #endif -#ifdef KC_INODE_DIO_END -#define kc_inode_dio_end inode_dio_end -#else -#define kc_inode_dio_end inode_dio_done -#endif - #ifndef KC_MM_VM_FAULT_T typedef unsigned int vm_fault_t; static inline vm_fault_t vmf_error(int err)