Fixes from b_port_step needed to get HEAD to build.

r=jacob
r=alex

diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index 6573517..36d44cc 100644 (file)
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -667,6 +667,7 @@ static inline void del_timer(struct timer_list *l)
 
 typedef struct { volatile int counter; } atomic_t;
 
+#define ATOMIC_INIT(i) { (i) }
 #define atomic_read(a) ((a)->counter)
 #define atomic_set(a,b) do {(a)->counter = b; } while (0)
 #define atomic_dec_and_test(a) ((--((a)->counter)) == 0)

diff --git a/lustre/liblustre/Makefile.am b/lustre/liblustre/Makefile.am
index 949c029..90a35c4 100644 (file)
--- a/lustre/liblustre/Makefile.am
+++ b/lustre/liblustre/Makefile.am
@@ -8,13 +8,13 @@ AM_CFLAGS = $(LLCFLAGS)
 LIBS = $(LIBEFENCE)
 
 LUSTRE_LIBS = liblutils.a libllite.a \
-              $(top_builddir)/lov/liblov.a \
-              $(top_builddir)/obdecho/libobdecho.a \
-              $(top_builddir)/osc/libosc.a \
-              $(top_builddir)/mdc/libmdc.a \
-              $(top_builddir)/ptlrpc/libptlrpc.a \
-              $(top_builddir)/obdclass/liblustreclass.a \
-              $(top_builddir)/lvfs/liblvfs.a
+              $(top_builddir)/lustre/lov/liblov.a \
+              $(top_builddir)/lustre/obdecho/libobdecho.a \
+              $(top_builddir)/lustre/osc/libosc.a \
+              $(top_builddir)/lustre/mdc/libmdc.a \
+              $(top_builddir)/lustre/ptlrpc/libptlrpc.a \
+              $(top_builddir)/lustre/obdclass/liblustreclass.a \
+              $(top_builddir)/lustre/lvfs/liblvfs.a
 
 if !CRAY_PORTALS
 PTL_LIBS =    $(top_builddir)/portals/utils/libuptlctl.a \

diff --git a/lustre/liblustre/lutil.c b/lustre/liblustre/lutil.c
index 248cc33..7ad8aa5 100644 (file)
--- a/lustre/liblustre/lutil.c
+++ b/lustre/liblustre/lutil.c
@@ -44,8 +44,7 @@
 void portals_debug_dumplog(void){};
 #endif
 
-unsigned int portal_subsystem_debug = ~0 - (S_PORTALS | S_QSWNAL | S_SOCKNAL |
-                                            S_GMNAL | S_OPENIBNAL);
+unsigned int portal_subsystem_debug = ~0 - S_NAL;
 unsigned int portal_debug = 0;
 
 struct task_struct     *current;

diff --git a/lustre/liblustre/tests/echo_test.c b/lustre/liblustre/tests/echo_test.c
index 3048af8..4223fac 100644 (file)
--- a/lustre/liblustre/tests/echo_test.c
+++ b/lustre/liblustre/tests/echo_test.c
@@ -40,18 +40,23 @@ struct pingcli_args {
         int size;
 };
 /*      bug #4615       */
+#if 0
 char *portals_id2str(int nal, ptl_process_id_t id, char *str)
 {
         switch(nal){
         case TCPNAL:
                 /* userspace NAL */
+        case IIBNAL:
+        case VIBNAL:
+        case OPENIBNAL:
+        case RANAL:
         case SOCKNAL:
                 snprintf(str, PTL_NALFMT_SIZE - 1, "%u:%u.%u.%u.%u,%u",
                          (__u32)(id.nid >> 32), HIPQUAD((id.nid)) , id.pid);
                 break;
         case QSWNAL:
         case GMNAL:
-        case IBNAL:
+        case LONAL:
                 snprintf(str, PTL_NALFMT_SIZE - 1, "%u:%u,%u",
                          (__u32)(id.nid >> 32), (__u32)id.nid, id.pid);
                 break;
@@ -62,6 +67,7 @@ char *portals_id2str(int nal, ptl_process_id_t id, char *str)
         }
         return str;
 }
+#endif
 
 static int liblustre_ioctl(int dev_id, unsigned int opc, void *ptr)
 {