LINUX 5.3.0: Check for 'recurse' arg in keyring_search

[openafs.git] / src / afs / LINUX / osi_module.c

diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index 145ec34..2b48453 100644 (file)
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -18,92 +18,60 @@
 #include <linux/module.h> /* early to avoid printf->printk mapping */
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
-#include "h/unistd.h"          /* For syscall numbers. */
-#include "h/mm.h"
+#include <linux/unistd.h>              /* For syscall numbers. */
+#include <linux/mm.h>
 
 #ifdef AFS_AMD64_LINUX20_ENV
 #include <asm/ia32_unistd.h>
 #endif
-#ifdef AFS_SPARC64_LINUX20_ENV
-#include <linux/ioctl32.h>
-#endif
 
 #include <linux/proc_fs.h>
 #include <linux/slab.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
-#endif
 
-extern struct file_system_type afs_fs_type;
+#include "osi_pagecopy.h"
 
-#if !defined(AFS_LINUX24_ENV)
-static long get_page_offset(void);
-#endif
+extern struct file_system_type afs_fs_type;
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
 DEFINE_MUTEX(afs_global_lock);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-DECLARE_MUTEX(afs_global_lock);
 #else
-struct semaphore afs_global_lock = MUTEX;
+DECLARE_MUTEX(afs_global_lock);
 #endif
 int afs_global_owner = 0;
-#if !defined(AFS_LINUX24_ENV)
-unsigned long afs_linux_page_offset = 0;       /* contains the PAGE_OFFSET value */
-#endif
 
+#ifdef HAVE_LINUX_KUID_T
+struct user_namespace *afs_ns;
+#endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 int __init
 afs_init(void)
-#else
-int
-init_module(void)
-#endif
 {
     int err;
-    AFS_RWLOCK_INIT(&afs_xosi, "afs_xosi");
 
-#if !defined(AFS_LINUX24_ENV)
-    /* obtain PAGE_OFFSET value */
-    afs_linux_page_offset = get_page_offset();
-
-#ifndef AFS_S390_LINUX22_ENV
-    if (afs_linux_page_offset == 0) {
-       /* couldn't obtain page offset so can't continue */
-       printf("afs: Unable to obtain PAGE_OFFSET. Exiting..");
-       return -EIO;
-    }
-#endif /* AFS_S390_LINUX22_ENV */
-#endif /* !defined(AFS_LINUX24_ENV) */
+#ifdef HAVE_LINUX_KUID_T
+    afs_ns = afs_current_user_ns();
+#endif
 
     osi_Init();
-#ifdef AFS_LINUX26_ENV
 #if !defined(AFS_NONFSTRANS)
     osi_linux_nfssrv_init();
 #endif
-#endif
 
-#ifndef LINUX_KEYRING_SUPPORT
     err = osi_syscall_init();
     if (err)
        return err;
-#endif
     err = afs_init_inodecache();
     if (err) {
-#ifndef LINUX_KEYRING_SUPPORT
        osi_syscall_clean();
-#endif
        return err;
     }
     err = register_filesystem(&afs_fs_type);
     if (err) {
        afs_destroy_inodecache();
-#ifndef LINUX_KEYRING_SUPPORT
        osi_syscall_clean();
-#endif
        return err;
     }
 
@@ -111,89 +79,39 @@ init_module(void)
 #ifdef LINUX_KEYRING_SUPPORT
     osi_keyring_init();
 #endif
-#ifdef AFS_LINUX24_ENV
     osi_proc_init();
     osi_ioctl_init();
-#endif
-#if defined(AFS_CACHE_BYPASS)
-    afs_warn("Cache bypass patched libafs module init.\n");
-#endif
+    afs_init_pagecopy();
+
     return 0;
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 void __exit
 afs_cleanup(void)
-#else
-void
-cleanup_module(void)
-#endif
 {
-#if defined(AFS_CACHE_BYPASS)
-    afs_warn("Cache bypass patched libafs module cleaning up.\n");
-#endif
+    afs_shutdown_pagecopy();
+
 #ifdef LINUX_KEYRING_SUPPORT
     osi_keyring_shutdown();
 #endif
     osi_sysctl_clean();
-#ifndef LINUX_KEYRING_SUPPORT
     osi_syscall_clean();
-#endif
     unregister_filesystem(&afs_fs_type);
 
     afs_destroy_inodecache();
-#ifdef AFS_LINUX26_ENV
 #if !defined(AFS_NONFSTRANS)
     osi_linux_nfssrv_shutdown();
 #endif
-#endif
+    shutdown_osisleep();
     osi_linux_free_afs_memory();
 
-#ifdef AFS_LINUX24_ENV
     osi_ioctl_clean();
     osi_proc_clean();
-#endif
+
     return;
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
 module_init(afs_init);
 module_exit(afs_cleanup);
-#endif
-
-
-#if !defined(AFS_LINUX24_ENV)
-static long
-get_page_offset(void)
-{
-#if defined(AFS_PPC_LINUX22_ENV) || defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_SPARC_LINUX20_ENV) || defined(AFS_ALPHA_LINUX20_ENV) || defined(AFS_S390_LINUX22_ENV) || defined(AFS_IA64_LINUX20_ENV) || defined(AFS_PARISC_LINUX24_ENV) || defined(AFS_AMD64_LINUX20_ENV) || defined(AFS_PPC64_LINUX20_ENV)
-    return PAGE_OFFSET;
-#else
-    struct task_struct *p, *q;
 
-    /* search backward thru the circular list */
-#if defined(EXPORTED_TASKLIST_LOCK) 
-    read_lock(&tasklist_lock);
-#endif
-    /* search backward thru the circular list */
-#ifdef DEFINED_PREV_TASK
-    for (q = current; p = q; q = prev_task(p)) {
-#else
-    for (p = current; p; p = p->prev_task) {
-#endif
-       if (p->pid == 1) {
-#if defined(EXPORTED_TASKLIST_LOCK) 
-           read_unlock(&tasklist_lock);
-#endif
-           return p->addr_limit.seg;
-       }
-    }
-
-#if defined(EXPORTED_TASKLIST_LOCK) 
-    read_unlock(&tasklist_lock);
-#endif
-    return 0;
-#endif
-}
-#endif /* !AFS_LINUX24_ENV */