b=2296

r=shaver

- Build ldlm into ptlrpc.
- Remove all the ptlrpc_ldlm_* hooks

This  almost certainly breaks building when $(SRDIR) != $(OBJDIR).

diff --git a/lustre/ldlm/ldlm_internal.h b/lustre/ldlm/ldlm_internal.h
index 33f8f5b..8dc312e 100644 (file)
--- a/lustre/ldlm/ldlm_internal.h
+++ b/lustre/ldlm/ldlm_internal.h
@@ -46,3 +46,6 @@ struct ldlm_state {
         struct ldlm_bl_pool *ldlm_bl_pool;
 };
 
+int __init ldlm_init(void);
+void __exit ldlm_exit(void);
+