From 3a50d69401cdec1b836f60b33a35aac93eef8844 Mon Sep 17 00:00:00 2001
From: ChenXiaoSong <chenxiaosong2@huawei.com>
Date: Fri, 9 Jul 2021 10:47:01 +0800
Subject: [PATCH] NFSv4.1: fix kabi for struct rpc_xprt

hulk inclusion
category: bugfix
bugzilla: NA
CVE: NA

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

commit a2ff6d97547e ("NFSv4.1: Don't rebind to the same source port when reconnecting to the server")
add new member into struct rpc_xprt,
which will break KABI. This patch try to fix it.

Signed-off-by: ChenXiaoSong <chenxiaosong2@huawei.com>
Reviewed-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 include/linux/sunrpc/xprt.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 36a944dda195..ccfacca1eba9 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -200,8 +200,12 @@ struct rpc_xprt {
 	unsigned int		min_reqs;	/* min number of slots */
 	unsigned int		num_reqs;	/* total slots */
 	unsigned long		state;		/* transport state */
+#ifdef __GENKSYMS__
+	unsigned char		resvport   : 1; /* use a reserved port */
+#else
 	unsigned char		resvport   : 1,	/* use a reserved port */
 				reuseport  : 1; /* reuse port on reconnect */
+#endif
 	atomic_t		swapper;	/* we're swapping over this
 						   transport */
 	unsigned int		bind_index;	/* bind function index */
-- 
GitLab