From 1a633836d2aa8a6bf81a1b330e7ab15e6e01f6bb Mon Sep 17 00:00:00 2001
From: jxb2018 <1369375419@qq.com>
Date: Wed, 6 Sep 2023 17:55:04 +0800
Subject: [PATCH] fixed some bugs related LINUX_VERSION_CODE

---
 qtfs/CMakeLists.txt     | 2 +-
 qtfs/qtfs/sb.c          | 2 +-
 qtfs/qtfs_common/conn.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qtfs/CMakeLists.txt b/qtfs/CMakeLists.txt
index ed30fdc..012c8db 100644
--- a/qtfs/CMakeLists.txt
+++ b/qtfs/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_C_FLAGS "-g -O2 -fstack-protector-strong -fPIE -pie -fPIC -D_FORTIFY_S
 add_executable(rexec rexec/rexec.c rexec/rexec_sock.c)
 add_executable(rexec_server rexec/rexec_server.c rexec/rexec_sock.c rexec/rexec_shim.c)
 target_include_directories(rexec_server PRIVATE /usr/include/glib-2.0 /usr/lib64/glib-2.0/include)
-target_link_libraries(rexec PRIVATE json-c)
+target_link_libraries(rexec PRIVATE json-c pthread)
 target_link_libraries(rexec_server PRIVATE json-c glib-2.0)
 
 # Build udsproxyd and libudsproxy.so
diff --git a/qtfs/qtfs/sb.c b/qtfs/qtfs/sb.c
index 05ec8ad..0ead9e1 100644
--- a/qtfs/qtfs/sb.c
+++ b/qtfs/qtfs/sb.c
@@ -517,7 +517,7 @@ static vm_fault_t qtfs_vm_fault(struct vm_fault *vmf)
 	return ret;
 }
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0))
 static vm_fault_t qtfs_map_pages(struct vm_fault *vmf,
  		pgoff_t start_pgoff, pgoff_t end_pgoff)
  {
diff --git a/qtfs/qtfs_common/conn.c b/qtfs/qtfs_common/conn.c
index 88307d9..09efba2 100644
--- a/qtfs/qtfs_common/conn.c
+++ b/qtfs/qtfs_common/conn.c
@@ -172,7 +172,7 @@ int qtfs_uds_remote_connect_user(int fd, struct sockaddr __user *addr, int len)
 	if (f.file == NULL) {
 		return -EBADF;
 	}
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0))
 	sock =sock_from_file(f.file);
 #else
 	sock = sock_from_file(f.file, &err);
-- 
Gitee