LU-4423 o2iblnd: use is_vmalloc_addr to check for vmalloc address

[fs/lustre-release.git] / lnet / klnds / o2iblnd / o2iblnd_cb.c

diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c
index eeef534..0905627 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -529,8 +529,7 @@ kiblnd_kvaddr_to_page (unsigned long vaddr)
 {
         struct page *page;
 
-        if (vaddr >= VMALLOC_START &&
-            vaddr < VMALLOC_END) {
+        if (is_vmalloc_addr((void *)vaddr)) {
                 page = vmalloc_to_page ((void *)vaddr);
                 LASSERT (page != NULL);
                 return page;
@@ -2615,14 +2614,18 @@ kiblnd_rejected (kib_conn_t *conn, int reason, void *priv, int priv_nob)
 
                         case IBLND_REJECT_MSG_QUEUE_SIZE:
                                 CERROR("%s rejected: incompatible message queue depth %d, %d\n",
-                                       libcfs_nid2str(peer->ibp_nid), cp->ibcp_queue_depth,
-                                       IBLND_MSG_QUEUE_SIZE(conn->ibc_version));
+                                      libcfs_nid2str(peer->ibp_nid),
+                                      cp != NULL ? cp->ibcp_queue_depth :
+                                      IBLND_MSG_QUEUE_SIZE(rej->ibr_version),
+                                      IBLND_MSG_QUEUE_SIZE(conn->ibc_version));
                                 break;
 
                         case IBLND_REJECT_RDMA_FRAGS:
                                 CERROR("%s rejected: incompatible # of RDMA fragments %d, %d\n",
-                                       libcfs_nid2str(peer->ibp_nid), cp->ibcp_max_frags,
-                                       IBLND_RDMA_FRAGS(conn->ibc_version));
+                                      libcfs_nid2str(peer->ibp_nid),
+                                      cp != NULL ? cp->ibcp_max_frags :
+                                      IBLND_RDMA_FRAGS(rej->ibr_version),
+                                      IBLND_RDMA_FRAGS(conn->ibc_version));
                                 break;
 
                         case IBLND_REJECT_NO_RESOURCES: