From be983eedd0e22770f018acc9220a7c2d52d87a73 Mon Sep 17 00:00:00 2001
From: Yang Yingliang <yangyingliang@huawei.com>
Date: Tue, 22 Sep 2020 10:12:04 +0800
Subject: [PATCH] fs: fix kabi broken introduced by fixing CVE-2020-14381

hulk inclusion
CVE: CVE-2020-14381

--------------------------------

Fix kabi broken introduced by fixing CVE-2020-14381.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Xie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: Jason Yan <yanaijie@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 include/linux/fs.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 1ed085cd22f4..a7db677a9e62 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -683,7 +683,6 @@ struct inode {
 		struct rcu_head		i_rcu;
 	};
 	atomic64_t		i_version;
-	atomic64_t		i_sequence; /* see futex */
 	atomic_t		i_count;
 	atomic_t		i_dio_count;
 	atomic_t		i_writecount;
@@ -715,7 +714,11 @@ struct inode {
 
 	void			*i_private; /* fs or device private pointer */
 
+#ifndef __GENKSYMS__
+	atomic64_t		i_sequence; /* see futex */
+#else
 	KABI_RESERVE(1)
+#endif
 	KABI_RESERVE(2)
 } __randomize_layout;
 
-- 
GitLab