land b1_4_bgl on HEAD (20050404_1913)

[fs/lustre-release.git] / lnet / libcfs / debug.c

diff --git a/lnet/libcfs/debug.c b/lnet/libcfs/debug.c
index 8cbb117..b7fd218 100644 (file)
--- a/lnet/libcfs/debug.c
+++ b/lnet/libcfs/debug.c
@@ -208,10 +208,18 @@ char *portals_nid2str(int nal, ptl_nid_t nid, char *str)
         case VIBNAL:
         case OPENIBNAL:
         case RANAL:
-        case SOCKNAL:
-                snprintf(str, PTL_NALFMT_SIZE, "%u:%u.%u.%u.%u",
-                         (__u32)(nid >> 32), HIPQUAD(nid));
+        case SOCKNAL: {
+                /* HIPQUAD requires __u32, but we can't cast in it */
+                __u32 nid32 = (__u32)nid;
+                if ((__u32)(nid >> 32)) {
+                        snprintf(str, PTL_NALFMT_SIZE, "%u:%u.%u.%u.%u",
+                                 (__u32)(nid >> 32), HIPQUAD(nid32));
+                } else {
+                        snprintf(str, PTL_NALFMT_SIZE, "%u.%u.%u.%u",
+                                 HIPQUAD(nid32));
+                }
                 break;
+        }
         case QSWNAL:
         case GMNAL:
         case LONAL: