DEVEL15-STABLE14-yscall-cleanup-if-we-installed-20071024

FIXES 75307

diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index 1d9f923353155326db52a2c976a76df9463cdcce..4b87f2c060f28aa749227c6e2bc5afb65c002844 100644 (file)
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -88,24 +88,18 @@ init_module(void)
 #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;
     }
 
@@ -133,9 +127,7 @@ cleanup_module(void)
     osi_keyring_shutdown();
 #endif
     osi_sysctl_clean();
-#ifndef LINUX_KEYRING_SUPPORT
     osi_syscall_clean();
-#endif
     unregister_filesystem(&afs_fs_type);
 
     afs_destroy_inodecache();