diff options
author | Michael Laß | 2022-07-21 23:18:25 +0200 |
---|---|---|
committer | Michael Laß | 2022-07-26 07:13:44 +0200 |
commit | cece32b31d9970e4db149150764efd84782d2dfa (patch) | |
tree | eeefeb234faf05f44601397c288248eb00171090 /0004-Linux-5.17-kernel-func-complete_and_exit-renamed.patch | |
parent | b86ee59da99b5ea488154b889b304e209e11aaee (diff) | |
download | aur-cece32b31d9970e4db149150764efd84782d2dfa.tar.gz |
Use patches likely to end up in next release
Instead of rolling our own set of patches for supporting newer kernels,
apply all changes that are accepted or likely to be accepted for the
next OpenAFS stable release. On top of that, backport patches for Linux
5.19.
Diffstat (limited to '0004-Linux-5.17-kernel-func-complete_and_exit-renamed.patch')
-rw-r--r-- | 0004-Linux-5.17-kernel-func-complete_and_exit-renamed.patch | 141 |
1 files changed, 0 insertions, 141 deletions
diff --git a/0004-Linux-5.17-kernel-func-complete_and_exit-renamed.patch b/0004-Linux-5.17-kernel-func-complete_and_exit-renamed.patch deleted file mode 100644 index 8abbb89b5bf0..000000000000 --- a/0004-Linux-5.17-kernel-func-complete_and_exit-renamed.patch +++ /dev/null @@ -1,141 +0,0 @@ -From a714e865efe41aa1112f6f9c8479112660dacd6f Mon Sep 17 00:00:00 2001 -From: Cheyenne Wills <cwills@sinenomine.net> -Date: Thu, 27 Jan 2022 20:19:17 -0700 -Subject: [PATCH 04/12] Linux-5.17: kernel func complete_and_exit renamed - -Handle the Linux kernel function rename made in commit - "exit: Rename complete_and_exit to kthread_complete_and_exit" - (cead1855) - -Add a new autoconf test for the linux function kthread_complete_and_exit -and if not found use a define to map kthread_complete_and_exit to -complete_and_exit. - -Replace calls to complete_and_exit with kthread_complete_and_exit. - -Reviewed-on: https://gerrit.openafs.org/14882 -Tested-by: BuildBot <buildbot@rampaginggeek.com> -Reviewed-by: Andrew Deason <adeason@sinenomine.net> -Reviewed-by: Benjamin Kaduk <kaduk@mit.edu> -(cherry picked from commit a651d4db7f86a24ea6784f6f27d5c8482667267b) - -Change-Id: Ibe96b92a84a8f876dda4019c221c37dabde93244 ---- - src/afs/LINUX/osi_compat.h | 4 ++++ - src/afs/afs_call.c | 18 ++++++++++-------- - src/cf/linux-kernel-func.m4 | 6 ++++++ - 3 files changed, 20 insertions(+), 8 deletions(-) - -diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h -index 726b6559c..53a079b67 100644 ---- a/src/afs/LINUX/osi_compat.h -+++ b/src/afs/LINUX/osi_compat.h -@@ -27,6 +27,10 @@ - # endif - #endif - -+#if !defined(HAVE_LINUX_KTHREAD_COMPLETE_AND_EXIT) -+# define kthread_complete_and_exit complete_and_exit -+#endif -+ - #if defined(STRUCT_DENTRY_OPERATIONS_HAS_D_AUTOMOUNT) && !defined(DCACHE_NEED_AUTOMOUNT) - # define DCACHE_NEED_AUTOMOUNT DMANAGED_AUTOMOUNT - #endif -diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c -index 32ad210c4..fab4c01ed 100644 ---- a/src/afs/afs_call.c -+++ b/src/afs/afs_call.c -@@ -19,7 +19,9 @@ - #include "afs/afs_stats.h" - #include "rx/rx_globals.h" - #if !defined(UKERNEL) --# if !defined(AFS_LINUX20_ENV) -+# if defined(AFS_LINUX20_ENV) -+# include "osi_compat.h" -+# else - # include "net/if.h" - # ifdef AFS_SGI62_ENV - # include "h/hashing.h" -@@ -328,7 +330,7 @@ afsd_thread(void *rock) - sprintf(current->comm, "afs_callback"); - afs_RXCallBackServer(); - AFS_GUNLOCK(); -- complete_and_exit(0, 0); -+ kthread_complete_and_exit(0, 0); - break; - case AFSOP_START_AFS: - sprintf(current->comm, "afs_afsstart"); -@@ -342,7 +344,7 @@ afsd_thread(void *rock) - sprintf(current->comm, "afsd"); - afs_Daemon(); - AFS_GUNLOCK(); -- complete_and_exit(0, 0); -+ kthread_complete_and_exit(0, 0); - break; - case AFSOP_START_BKG: - #ifdef AFS_NEW_BKG -@@ -361,7 +363,7 @@ afsd_thread(void *rock) - afs_BackgroundDaemon(); - AFS_GUNLOCK(); - #endif -- complete_and_exit(0, 0); -+ kthread_complete_and_exit(0, 0); - break; - case AFSOP_START_TRUNCDAEMON: - sprintf(current->comm, "afs_trimstart"); -@@ -372,7 +374,7 @@ afsd_thread(void *rock) - sprintf(current->comm, "afs_cachetrim"); - afs_CacheTruncateDaemon(); - AFS_GUNLOCK(); -- complete_and_exit(0, 0); -+ kthread_complete_and_exit(0, 0); - break; - case AFSOP_START_CS: - sprintf(current->comm, "afs_checkserver"); -@@ -380,7 +382,7 @@ afsd_thread(void *rock) - complete(arg->complete); - afs_CheckServerDaemon(); - AFS_GUNLOCK(); -- complete_and_exit(0, 0); -+ kthread_complete_and_exit(0, 0); - break; - case AFSOP_RXEVENT_DAEMON: - sprintf(current->comm, "afs_evtstart"); -@@ -398,7 +400,7 @@ afsd_thread(void *rock) - sprintf(current->comm, "afs_rxevent"); - afs_rxevent_daemon(); - AFS_GUNLOCK(); -- complete_and_exit(0, 0); -+ kthread_complete_and_exit(0, 0); - break; - #ifdef RXK_LISTENER_ENV - case AFSOP_RXLISTENER_DAEMON: -@@ -420,7 +422,7 @@ afsd_thread(void *rock) - sprintf(current->comm, "afs_rxlistener"); - rxk_Listener(); - AFS_GUNLOCK(); -- complete_and_exit(0, 0); -+ kthread_complete_and_exit(0, 0); - break; - #endif - default: -diff --git a/src/cf/linux-kernel-func.m4 b/src/cf/linux-kernel-func.m4 -index 0ca3e4463..cd4afe914 100644 ---- a/src/cf/linux-kernel-func.m4 -+++ b/src/cf/linux-kernel-func.m4 -@@ -178,6 +178,12 @@ AC_CHECK_LINUX_FUNC([ip_sock_set], - [#include <net/ip.h>], - [ip_sock_set_mtu_discover(NULL, 0);]) - -+dnl Linux 5.17 renamed complete_and_exit to kthread_complete_and_exit -+AC_CHECK_LINUX_FUNC([kthread_complete_and_exit], -+ [#include <linux/kernel.h> -+ #include <linux/kthread.h>], -+ [kthread_complete_and_exit(0, 0);]) -+ - dnl Consequences - things which get set as a result of the - dnl above tests - AS_IF([test "x$ac_cv_linux_func_d_alloc_anon" = "xno"], --- -2.36.1 - |