From 276034f89df8bbe9f9ad775781dae77efe28f34f Mon Sep 17 00:00:00 2001
From: Auke Kok <auke.kok@versity.com>
Date: Thu, 13 Nov 2025 11:59:10 -0800
Subject: [PATCH] Remove iversion.h compat for el7

For simplicity we just include the header here now that we
don't need it in the kernelcompat anymore.

Signed-off-by: Auke Kok <auke.kok@versity.com>
---
 kmod/src/Makefile.kernelcompat | 10 ----------
 kmod/src/acl.c                 |  1 +
 kmod/src/data.c                |  1 +
 kmod/src/dir.c                 |  1 +
 kmod/src/inode.c               |  1 +
 kmod/src/kernelcompat.h        | 25 -------------------------
 kmod/src/xattr.c               |  1 +
 7 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/kmod/src/Makefile.kernelcompat b/kmod/src/Makefile.kernelcompat
index 6e888e0c..ffe66ced 100644
--- a/kmod/src/Makefile.kernelcompat
+++ b/kmod/src/Makefile.kernelcompat
@@ -6,16 +6,6 @@
 
 ccflags-y += -include $(src)/kernelcompat.h
 
-#
-# v4.15-rc3-4-gae5e165d855d
-#
-# linux/iversion.h needs to manually be included for code that
-# manipulates this field.
-#
-ifneq (,$(shell grep -s 'define _LINUX_IVERSION_H' include/linux/iversion.h))
-ccflags-y += -DKC_NEED_LINUX_IVERSION_H=1
-endif
-
 # v4.11-12447-g104b4e5139fe
 #
 # Renamed __percpu_counter_add to percpu_counter_add_batch to clarify
diff --git a/kmod/src/acl.c b/kmod/src/acl.c
index f393d9af..8ae6e8ff 100644
--- a/kmod/src/acl.c
+++ b/kmod/src/acl.c
@@ -16,6 +16,7 @@
 #include <linux/xattr.h>
 #include <linux/posix_acl.h>
 #include <linux/posix_acl_xattr.h>
+#include <linux/iversion.h>
 
 #include "format.h"
 #include "super.h"
diff --git a/kmod/src/data.c b/kmod/src/data.c
index b6ca5eb1..65c07f01 100644
--- a/kmod/src/data.c
+++ b/kmod/src/data.c
@@ -23,6 +23,7 @@
 #include <linux/fiemap.h>
 #include <linux/writeback.h>
 #include <linux/overflow.h>
+#include <linux/iversion.h>
 
 #include "format.h"
 #include "super.h"
diff --git a/kmod/src/dir.c b/kmod/src/dir.c
index e2bc774c..59fd00aa 100644
--- a/kmod/src/dir.c
+++ b/kmod/src/dir.c
@@ -18,6 +18,7 @@
 #include <linux/xattr.h>
 #include <linux/namei.h>
 #include <linux/mm.h>
+#include <linux/iversion.h>
 
 #include "format.h"
 #include "file.h"
diff --git a/kmod/src/inode.c b/kmod/src/inode.c
index 621833d2..3c87353d 100644
--- a/kmod/src/inode.c
+++ b/kmod/src/inode.c
@@ -21,6 +21,7 @@
 #include <linux/list_sort.h>
 #include <linux/workqueue.h>
 #include <linux/buffer_head.h>
+#include <linux/iversion.h>
 
 #include "format.h"
 #include "super.h"
diff --git a/kmod/src/kernelcompat.h b/kmod/src/kernelcompat.h
index d2394739..0e7d9b84 100644
--- a/kmod/src/kernelcompat.h
+++ b/kmod/src/kernelcompat.h
@@ -4,31 +4,6 @@
 #include <linux/kernel.h>
 #include <linux/fs.h>
 
-/*
- * v4.15-rc3-4-gae5e165d855d
- *
- * new API for handling inode->i_version. This forces us to
- * include this API where we need. We include it here for
- * convenience instead of where it's needed.
- */
-#ifdef KC_NEED_LINUX_IVERSION_H
-#include <linux/iversion.h>
-#else
-/*
- * Kernels before above version will need to fall back to
- * manipulating inode->i_version as previous with degraded
- * methods.
- */
-#define inode_set_iversion_queried(inode, val)	\
-do {						\
-	(inode)->i_version = val;		\
-} while (0)
-#define inode_peek_iversion(inode)		\
-({						\
-	(inode)->i_version;			\
-})
-#endif
-
 /*
  * v3.6-rc1-24-gdbf2576e37da
  *
diff --git a/kmod/src/xattr.c b/kmod/src/xattr.c
index d8c468e3..cb9f0549 100644
--- a/kmod/src/xattr.c
+++ b/kmod/src/xattr.c
@@ -16,6 +16,7 @@
 #include <linux/xattr.h>
 #include <linux/crc32c.h>
 #include <linux/posix_acl.h>
+#include <linux/iversion.h>
 
 #include "format.h"
 #include "inode.h"