Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-4307 kerberos: fix __exit usage and unknown symbol errors
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
gss
/
sec_gss.c
diff --git
a/lustre/ptlrpc/gss/sec_gss.c
b/lustre/ptlrpc/gss/sec_gss.c
index
74eb470
..
043a683
100644
(file)
--- a/
lustre/ptlrpc/gss/sec_gss.c
+++ b/
lustre/ptlrpc/gss/sec_gss.c
@@
-2874,21
+2874,16
@@
int __init sptlrpc_gss_init(void)
if (rc)
goto out_kerberos;
if (rc)
goto out_kerberos;
-#ifdef HAVE_GSS_PIPEFS
rc = gss_init_pipefs();
if (rc)
goto out_keyring;
rc = gss_init_pipefs();
if (rc)
goto out_keyring;
-#endif
gss_init_at_reply_offset();
return 0;
gss_init_at_reply_offset();
return 0;
-#ifdef HAVE_GSS_PIPEFS
out_keyring:
gss_exit_keyring();
out_keyring:
gss_exit_keyring();
-#endif
-
out_kerberos:
cleanup_kerberos_module();
out_svc_upcall:
out_kerberos:
cleanup_kerberos_module();
out_svc_upcall:
@@
-2903,9
+2898,7
@@
out_lproc:
static void __exit sptlrpc_gss_exit(void)
{
gss_exit_keyring();
static void __exit sptlrpc_gss_exit(void)
{
gss_exit_keyring();
-#ifdef HAVE_GSS_PIPEFS
gss_exit_pipefs();
gss_exit_pipefs();
-#endif
cleanup_kerberos_module();
gss_exit_svc_upcall();
gss_exit_cli_upcall();
cleanup_kerberos_module();
gss_exit_svc_upcall();
gss_exit_cli_upcall();