* Included changes from *old* b1_4/b_cray

    *  OBD_FL_DEBUG_CHECK for consistent obdecho end-to-end checking

    *  struct echo_obd cleanup

    *  obdecho support for "difficult" reply testing (test_setattr)

    *  replaced cowardly eap_from_cookie() usage with EAP_FROM_COOKIE()
       which asserts it is being called correctly

    *  bracketed echo_client_iocontrol() guts with unlock/lock_kernel()
       for increased concurrency during echo ioctl execution

    *  better thread control and stats in obd.c

    *  n-threads-over-m-objects test_brw support (required for
       obdfilter-survey)

* openibnal changes

    *  re-enabled openib on 2.5/2.6 builds
       configure --with-openib=no can be used to disable openib explicitly if
       required.

    *  fixed some 64 bit casts

    *  just use kernel's page_to_phys()

* fixed CERROR format problem in libcfs/module.c

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index e9c466a..c840f4a 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -393,9 +393,7 @@ AC_DEFUN([LP_PROG_LINUX],
 LP_CONFIG_AFFINITY
 LP_CONFIG_QUADRICS
 LP_CONFIG_GM
-if test $linux25 = 'no' ; then
-       LP_CONFIG_OPENIB
-fi
+LP_CONFIG_OPENIB
 LP_CONFIG_IIB
 LP_CONFIG_VIB
 LP_CONFIG_RANAL

diff --git a/lnet/klnds/openiblnd/openiblnd.c b/lnet/klnds/openiblnd/openiblnd.c
index 652eb34..604dee0 100644 (file)
--- a/lnet/klnds/openiblnd/openiblnd.c
+++ b/lnet/klnds/openiblnd/openiblnd.c
@@ -1289,7 +1289,8 @@ kibnal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
         /*****************************************************/
 
         for (i = 0; i < IBNAL_N_SCHED; i++) {
-                rc = kibnal_thread_start (kibnal_scheduler, (void *)i);
+                rc = kibnal_thread_start (kibnal_scheduler,
+                                          (void *)((unsigned long)i));
                 if (rc != 0) {
                         CERROR("Can't spawn openibnal scheduler[%d]: %d\n",
                                i, rc);

diff --git a/lnet/klnds/openiblnd/openiblnd.h b/lnet/klnds/openiblnd/openiblnd.h
index 2fbd88b..fd7bc61 100644 (file)
--- a/lnet/klnds/openiblnd/openiblnd.h
+++ b/lnet/klnds/openiblnd/openiblnd.h
@@ -60,6 +60,7 @@
 #include <ts_ib_sa_client.h>
 
 #define IBNAL_SERVICE_NAME   "openibnal"
+#define IBNAL_CHECK_ADVERT   1
 
 #if CONFIG_SMP
 # define IBNAL_N_SCHED      num_online_cpus()   /* # schedulers */
@@ -452,17 +453,11 @@ kibnal_show_rdma_attr (kib_conn_t *conn)
 }
 #endif
 
-#if CONFIG_X86
 static inline __u64
 kibnal_page2phys (struct page *p)
 {
-        __u64 page_number = p - mem_map;
-        
-        return (page_number << PAGE_SHIFT);
+        return page_to_phys(p);
 }
-#else
-# error "no page->phys"
-#endif
 
 /* CAVEAT EMPTOR:
  * We rely on tx/rx descriptor alignment to allow us to use the lowest bit
@@ -525,7 +520,7 @@ extern void kibnal_start_active_rdma (int type, int status,
                                       kib_rx_t *rx, lib_msg_t *libmsg, 
                                       unsigned int niov, 
                                       struct iovec *iov, ptl_kiov_t *kiov,
-                                      size_t offset, size_t nob);
+                                      int offset, int nob);
 
 
 

diff --git a/lnet/klnds/openiblnd/openiblnd_cb.c b/lnet/klnds/openiblnd/openiblnd_cb.c
index d774853..f6f18ff 100644 (file)
--- a/lnet/klnds/openiblnd/openiblnd_cb.c
+++ b/lnet/klnds/openiblnd/openiblnd_cb.c
@@ -1173,7 +1173,7 @@ kibnal_start_active_rdma (int type, int status,
                            kib_rx_t *rx, lib_msg_t *libmsg, 
                            unsigned int niov,
                            struct iovec *iov, ptl_kiov_t *kiov,
-                           size_t offset, size_t nob)
+                           int offset, int nob)
 {
         kib_msg_t    *rxmsg = rx->rx_msg;
         kib_msg_t    *txmsg;
@@ -1309,8 +1309,8 @@ kibnal_sendmsg(lib_nal_t    *nal,
                 unsigned int  payload_niov, 
                 struct iovec *payload_iov, 
                 ptl_kiov_t   *payload_kiov,
-                size_t        payload_offset,
-                size_t        payload_nob)
+                int           payload_offset,
+                int           payload_nob)
 {
         kib_msg_t  *ibmsg;
         kib_tx_t   *tx;
@@ -1318,8 +1318,8 @@ kibnal_sendmsg(lib_nal_t    *nal,
 
         /* NB 'private' is different depending on what we're sending.... */
 
-        CDEBUG(D_NET, "sending "LPSZ" bytes in %d frags to nid:"LPX64
-               " pid %d\n", payload_nob, payload_niov, nid , pid);
+        CDEBUG(D_NET, "sending %d bytes in %d frags to nid:"LPX64" pid %d\n",
+               payload_nob, payload_niov, nid , pid);
 
         LASSERT (payload_nob == 0 || payload_niov > 0);
         LASSERT (payload_niov <= PTL_MD_MAX_IOV);
@@ -1447,7 +1447,7 @@ kibnal_send_pages (lib_nal_t *nal, void *private, lib_msg_t *cookie,
 ptl_err_t
 kibnal_recvmsg (lib_nal_t *nal, void *private, lib_msg_t *libmsg,
                  unsigned int niov, struct iovec *iov, ptl_kiov_t *kiov,
-                 size_t offset, size_t mlen, size_t rlen)
+                 int offset, int mlen, int rlen)
 {
         kib_rx_t    *rx = private;
         kib_msg_t   *rxmsg = rx->rx_msg;

diff --git a/lnet/libcfs/module.c b/lnet/libcfs/module.c
index 2a8e6f6..9358af2 100644 (file)
--- a/lnet/libcfs/module.c
+++ b/lnet/libcfs/module.c
@@ -457,7 +457,7 @@ static int libcfs_ioctl(struct inode *inode, struct file *file,
                 struct portals_cfg pcfg;
 
                 if (data->ioc_plen1 != sizeof(pcfg)) {
-                        CERROR("Bad ioc_plen1 %d (wanted %d)\n",
+                        CERROR("Bad ioc_plen1 %d (wanted "LPSZ")\n",
                                data->ioc_plen1, sizeof(pcfg));
                         err = -EINVAL;
                         break;