diff --git a/qtfs/CMakeLists.txt b/qtfs/CMakeLists.txt index ed30fdc71d15a724b152fee5ea9a6d4f34046b8b..012c8db21208b5fcfafb5a36fe5b9ff2cf00c58e 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 05ec8ad9a4fc7eedc8fd25d8c95a551aab21637d..0ead9e194501f492c67b67047470438671868457 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 88307d90b96bc0ace256315ded31ba4c3766a7ef..09efba205717158b9094887becd566c5aa812430 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);