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-12514 target: move server mount code to target layer
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
ptlrpc_module.c
diff --git
a/lustre/ptlrpc/ptlrpc_module.c
b/lustre/ptlrpc/ptlrpc_module.c
index
abde1f2
..
c21fa62
100644
(file)
--- a/
lustre/ptlrpc/ptlrpc_module.c
+++ b/
lustre/ptlrpc/ptlrpc_module.c
@@
-59,13
+59,9
@@
static __init int ptlrpc_init(void)
if (rc)
RETURN(rc);
if (rc)
RETURN(rc);
- rc = tgt_mod_init();
- if (rc)
- GOTO(err_layout, rc);
-
rc = ptlrpc_hr_init();
if (rc)
rc = ptlrpc_hr_init();
if (rc)
- GOTO(err_
tg
t, rc);
+ GOTO(err_
layou
t, rc);
rc = ptlrpc_request_cache_init();
if (rc)
rc = ptlrpc_request_cache_init();
if (rc)
@@
-95,13
+91,22
@@
static __init int ptlrpc_init(void)
if (rc)
GOTO(err_sptlrpc, rc);
if (rc)
GOTO(err_sptlrpc, rc);
- rc = nodemap_mod_init();
+#ifdef HAVE_SERVER_SUPPORT
+ rc = tgt_mod_init();
if (rc)
GOTO(err_nrs, rc);
if (rc)
GOTO(err_nrs, rc);
+ rc = nodemap_mod_init();
+ if (rc)
+ GOTO(err_tgt, rc);
+#endif
RETURN(0);
RETURN(0);
+#ifdef HAVE_SERVER_SUPPORT
+err_tgt:
+ tgt_mod_exit();
err_nrs:
ptlrpc_nrs_fini();
err_nrs:
ptlrpc_nrs_fini();
+#endif
err_sptlrpc:
sptlrpc_fini();
err_ldlm:
err_sptlrpc:
sptlrpc_fini();
err_ldlm:
@@
-116,8
+121,6
@@
err_cache:
ptlrpc_request_cache_fini();
err_hr:
ptlrpc_hr_fini();
ptlrpc_request_cache_fini();
err_hr:
ptlrpc_hr_fini();
-err_tgt:
- tgt_mod_exit();
err_layout:
req_layout_fini();
return rc;
err_layout:
req_layout_fini();
return rc;
@@
-125,7
+128,10
@@
err_layout:
static void __exit ptlrpc_exit(void)
{
static void __exit ptlrpc_exit(void)
{
+#ifdef HAVE_SERVER_SUPPORT
nodemap_mod_exit();
nodemap_mod_exit();
+ tgt_mod_exit();
+#endif
ptlrpc_nrs_fini();
sptlrpc_fini();
ldlm_exit();
ptlrpc_nrs_fini();
sptlrpc_fini();
ldlm_exit();
@@
-134,7
+140,6
@@
static void __exit ptlrpc_exit(void)
ptlrpc_request_cache_fini();
ptlrpc_hr_fini();
ptlrpc_connection_fini();
ptlrpc_request_cache_fini();
ptlrpc_hr_fini();
ptlrpc_connection_fini();
- tgt_mod_exit();
req_layout_fini();
}
req_layout_fini();
}