* Bug 2869: Added PtlInit() parameter "int *max_interfaces"

*  Bug 2870: Added PtlMDBind parameter "ptl_unlink_t unlink_op"

diff --git a/lnet/lnet/api-init.c b/lnet/lnet/api-init.c
index 27ebc1d..0f6adfc 100644 (file)
--- a/lnet/lnet/api-init.c
+++ b/lnet/lnet/api-init.c
@@ -27,8 +27,10 @@
 
 int ptl_init;
 
-int PtlInit(void)
+int PtlInit(int *max_interfaces)
 {
+        if (max_interfaces != NULL)
+                *max_interfaces = NAL_ENUM_END_MARKER;
 
         if (ptl_init)
                 return PTL_OK;

diff --git a/lnet/lnet/lib-md.c b/lnet/lnet/lib-md.c
index 636e1c0..9a391cd 100644 (file)
--- a/lnet/lnet/lib-md.c
+++ b/lnet/lnet/lib-md.c
@@ -312,8 +312,8 @@ int do_PtlMDBind(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
 
         state_lock(nal, &flags);
 
-        ret->rc = lib_md_build(nal, md, private,
-                               &args->md_in, &args->eq_in, PTL_UNLINK);
+        ret->rc = lib_md_build(nal, md, private, &args->md_in, 
+                               &args->eq_in, args->unlink_in);
 
         if (ret->rc == PTL_OK) {
                 ptl_md2handle(&ret->handle_out, md);

diff --git a/lustre/portals/portals/api-init.c b/lustre/portals/portals/api-init.c
index 27ebc1d..0f6adfc 100644 (file)
--- a/lustre/portals/portals/api-init.c
+++ b/lustre/portals/portals/api-init.c
@@ -27,8 +27,10 @@
 
 int ptl_init;
 
-int PtlInit(void)
+int PtlInit(int *max_interfaces)
 {
+        if (max_interfaces != NULL)
+                *max_interfaces = NAL_ENUM_END_MARKER;
 
         if (ptl_init)
                 return PTL_OK;

diff --git a/lustre/portals/portals/lib-md.c b/lustre/portals/portals/lib-md.c
index 636e1c0..9a391cd 100644 (file)
--- a/lustre/portals/portals/lib-md.c
+++ b/lustre/portals/portals/lib-md.c
@@ -312,8 +312,8 @@ int do_PtlMDBind(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
 
         state_lock(nal, &flags);
 
-        ret->rc = lib_md_build(nal, md, private,
-                               &args->md_in, &args->eq_in, PTL_UNLINK);
+        ret->rc = lib_md_build(nal, md, private, &args->md_in, 
+                               &args->eq_in, args->unlink_in);
 
         if (ret->rc == PTL_OK) {
                 ptl_md2handle(&ret->handle_out, md);