Whamcloud - gitweb
add macro LCONSOLE_ERROR_MSG with extra parameter and map
authorshadow <shadow>
Thu, 14 Jun 2007 08:33:24 +0000 (08:33 +0000)
committershadow <shadow>
Thu, 14 Jun 2007 08:33:24 +0000 (08:33 +0000)
LCONSOLE_ERROR(fmt, arg) to LCONSOLE_ERROR_MSG(0x000, fmt, ## arg).

b=10595
i=adilger

16 files changed:
lnet/include/libcfs/libcfs.h
lnet/klnds/iiblnd/iiblnd.c
lnet/klnds/iiblnd/iiblnd_cb.c
lnet/klnds/o2iblnd/o2iblnd_cb.c
lnet/klnds/openiblnd/openiblnd_cb.c
lnet/klnds/ptllnd/ptllnd_peer.c
lnet/klnds/qswlnd/qswlnd.c
lnet/klnds/ralnd/ralnd_cb.c
lnet/klnds/socklnd/socklnd.c
lnet/klnds/socklnd/socklnd_cb.c
lnet/klnds/viblnd/viblnd_cb.c
lnet/libcfs/nidstrings.c
lnet/lnet/acceptor.c
lnet/lnet/api-ni.c
lnet/lnet/config.c
lnet/lnet/router.c

index 4918ae0..b57f2ab 100644 (file)
@@ -238,8 +238,10 @@ do {                                                                    \
 #define LCONSOLE(mask, format, a...) CDEBUG(D_CONSOLE | (mask), format, ## a)
 #define LCONSOLE_INFO(format, a...)  CDEBUG_LIMIT(D_CONSOLE, format, ## a)
 #define LCONSOLE_WARN(format, a...)  CDEBUG_LIMIT(D_CONSOLE | D_WARNING, format, ## a)
-#define LCONSOLE_ERROR(errnum, format, a...) CDEBUG_LIMIT(D_CONSOLE | D_ERROR, \
-                         "%x-%x: " format, errnum, LERRCHKSUM(errnum),  ## a)
+#define LCONSOLE_ERROR_MSG(errnum, format, a...) CDEBUG_LIMIT(D_CONSOLE | D_ERROR, \
+                           "%x-%x: " format, errnum, LERRCHKSUM(errnum),  ## a)
+#define LCONSOLE_ERROR(format, a...) LCONSOLE_ERROR_MSG(0x00, format, ## a)
+
 #define LCONSOLE_EMERG(format, a...) CDEBUG(D_CONSOLE | D_EMERG, format, ## a)
 
 #ifdef CDEBUG_ENABLED
index 288fea1..31bcfc6 100644 (file)
@@ -2128,7 +2128,8 @@ kibnal_module_init (void)
         int    rc;
 
         if (the_lnet.ln_ptlcompat != 0) {
-                LCONSOLE_ERROR(0x12c, "IIB does not support portals compatibility mode\n");
+                LCONSOLE_ERROR_MSG(0x12c, "IIB does not support portals "
+                                   "compatibility mode\n");
                 return -ENODEV;
         }
         
index 91a22b8..3e67548 100644 (file)
@@ -1707,11 +1707,12 @@ kibnal_eager_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
 
         if (conn->ibc_version == IBNAL_MSG_VERSION_RDMAREPLYNOTRSRVD) {
                 /* Can't block if RDMA completions need normal credits */
-                LCONSOLE_ERROR(0x12d, "Dropping message from %s: no buffers free. "
-                               "%s is running an old version of LNET that may "
-                               "deadlock if messages wait for buffers)\n",
-                               libcfs_nid2str(conn->ibc_peer->ibp_nid),
-                               libcfs_nid2str(conn->ibc_peer->ibp_nid));
+                LCONSOLE_ERROR_MSG(0x12d,  "Dropping message from %s: no "
+                                   "buffers free. %s is running an old version"
+                                   " of LNET that may deadlock if messages "
+                                   "wait for buffers)\n",
+                                   libcfs_nid2str(conn->ibc_peer->ibp_nid),
+                                   libcfs_nid2str(conn->ibc_peer->ibp_nid));
                 return -EDEADLK;
         }
         
index c13c4c0..74bcb94 100644 (file)
@@ -2746,8 +2746,9 @@ kiblnd_cm_callback(struct rdma_cm_id *cmid, struct rdma_cm_event *event)
                 return 0;
 
        case RDMA_CM_EVENT_DEVICE_REMOVAL:
-                LCONSOLE_ERROR(0x131, "Received notification of device removal\n"
-                        "Please shutdown LNET to allow this to proceed\n");
+                LCONSOLE_ERROR_MSG(0x131, 
+                                   "Received notification of device removal\n"
+                                   "Please shutdown LNET to allow this to proceed\n");
                 /* Can't remove network from underneath LNET for now, so I have
                  * to ignore this */
                return 0;
index a5ac469..be869e9 100644 (file)
@@ -1357,7 +1357,8 @@ kibnal_eager_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
 
         if (conn->ibc_version == IBNAL_MSG_VERSION_RDMAREPLYNOTRSRVD) {
                 /* Can't block if RDMA completions need normal credits */
-                LCONSOLE_ERROR(0x12a, "Dropping message from %s: no buffers free. "
+                LCONSOLE_ERROR_MSG(0x12a, 
+                               "Dropping message from %s: no buffers free. "
                                "%s is running an old version of LNET that may "
                                "deadlock if messages wait for buffers)\n",
                                libcfs_nid2str(conn->ibc_peer->ibp_nid),
index f7fc923..d0f0bdb 100644 (file)
@@ -806,10 +806,11 @@ kptllnd_peer_check_bucket (int idx, int stamp)
                 nactive = kptllnd_count_queue(&peer->peer_activeq);
                 spin_unlock_irqrestore(&peer->peer_lock, flags);
 
-                LCONSOLE_ERROR(0x126, "Timing out %s: %s\n",
-                               libcfs_id2str(peer->peer_id),
-                               (tx->tx_tposted == 0) ? 
-                               "no free peer buffers" : "please check Portals");
+                LCONSOLE_ERROR_MSG(0x126, "Timing out %s: %s\n",
+                                   libcfs_id2str(peer->peer_id),
+                                   (tx->tx_tposted == 0) ? 
+                                   "no free peer buffers" : 
+                                   "please check Portals");
 
                 CERROR("%s timed out: cred %d outstanding %d, sent %d, "
                        "sendq %d, activeq %d Tx %p %s (%s%s%s) status %d "
@@ -874,12 +875,12 @@ kptllnd_id2peer_locked (lnet_process_id_t id)
 void
 kptllnd_peertable_overflow_msg(char *str, lnet_process_id_t id)
 {
-        LCONSOLE_ERROR(0x127, "%s %s overflows the peer table[%d]: "
-                       "messages may be dropped\n",
-                       str, libcfs_id2str(id),
-                       kptllnd_data.kptl_n_active_peers);
-        LCONSOLE_ERROR(0x128, "Please correct by increasing "
-                       "'max_nodes' or 'max_procs_per_node'\n");
+        LCONSOLE_ERROR_MSG(0x127, "%s %s overflows the peer table[%d]: "
+                           "messages may be dropped\n",
+                           str, libcfs_id2str(id),
+                           kptllnd_data.kptl_n_active_peers);
+        LCONSOLE_ERROR_MSG(0x128, "Please correct by increasing "
+                           "'max_nodes' or 'max_procs_per_node'\n");
 }
 
 __u64
index 79986c1..ef46fca 100644 (file)
@@ -1,4 +1,5 @@
-/*
+ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
  * Copyright (C) 2002-2004 Cluster File Systems, Inc.
  *   Author: Eric Barton <eric@bartonsoftware.com>
  *
@@ -268,10 +269,10 @@ kqswnal_startup (lnet_ni_t *ni)
 
        if (*kqswnal_tunables.kqn_credits >=
            *kqswnal_tunables.kqn_ntxmsgs) {
-               LCONSOLE_ERROR(0x12e, "Configuration error: please set "
-                              "ntxmsgs(%d) > credits(%d)\n",
-                              *kqswnal_tunables.kqn_ntxmsgs,
-                              *kqswnal_tunables.kqn_credits);
+               LCONSOLE_ERROR_MSG(0x12e, "Configuration error: please set "
+                                  "ntxmsgs(%d) > credits(%d)\n",
+                                  *kqswnal_tunables.kqn_ntxmsgs,
+                                  *kqswnal_tunables.kqn_credits);
        }
         
        CDEBUG (D_MALLOC, "start kmem %d\n", atomic_read(&libcfs_kmemory));
index a1b09f0..96296d5 100644 (file)
@@ -766,8 +766,8 @@ kranal_eager_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
 {
         kra_conn_t *conn = (kra_conn_t *)private;
 
-        LCONSOLE_ERROR(0x12b, "Dropping message from %s: no buffers free.\n",
-                       libcfs_nid2str(conn->rac_peer->rap_nid));
+        LCONSOLE_ERROR_MSG(0x12b, "Dropping message from %s: no buffers free.\n",
+                           libcfs_nid2str(conn->rac_peer->rap_nid));
 
         return -EDEADLK;
 }
index 746ef08..e9df82a 100644 (file)
@@ -965,9 +965,9 @@ ksocknal_accept (lnet_ni_t *ni, cfs_socket_t *sock)
 
         LIBCFS_ALLOC(cr, sizeof(*cr));
         if (cr == NULL) {
-                LCONSOLE_ERROR(0x12f, "Dropping connection request from "
-                               "%u.%u.%u.%u: memory exhausted\n",
-                               HIPQUAD(peer_ip));
+                LCONSOLE_ERROR_MSG(0x12f, "Dropping connection request from "
+                                   "%u.%u.%u.%u: memory exhausted\n",
+                                   HIPQUAD(peer_ip));
                 return -ENOMEM;
         }
 
index 60635d4..65e5829 100644 (file)
@@ -2277,13 +2277,13 @@ ksocknal_recv_hello (lnet_ni_t *ni, ksock_conn_t *conn,
                 *peerid = recv_id;
         } else if (peerid->pid != recv_id.pid ||
                    !lnet_ptlcompat_matchnid(peerid->nid, recv_id.nid)) {
-                LCONSOLE_ERROR(0x130, "Connected successfully to %s on host "
-                               "%u.%u.%u.%u, but they claimed they were "
-                               "%s; please check your Lustre "
-                               "configuration.\n",
-                               libcfs_id2str(*peerid),
-                               HIPQUAD(conn->ksnc_ipaddr),
-                               libcfs_id2str(recv_id));
+                LCONSOLE_ERROR_MSG(0x130, "Connected successfully to %s on host"
+                                   " %u.%u.%u.%u, but they claimed they were "
+                                   "%s; please check your Lustre "
+                                   "configuration.\n",
+                                   libcfs_id2str(*peerid),
+                                   HIPQUAD(conn->ksnc_ipaddr),
+                                   libcfs_id2str(recv_id));
                 return -EPROTO;
         }
 
index ebd5c2c..a2d25f3 100644 (file)
@@ -1679,11 +1679,12 @@ kibnal_eager_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
 
         if (conn->ibc_version == IBNAL_MSG_VERSION_RDMAREPLYNOTRSRVD) {
                 /* Can't block if RDMA completions need normal credits */
-                LCONSOLE_ERROR(0x129, "Dropping message from %s: no buffers "
-                               " free. %s is running an old version of LNET "
-                               "that may deadlock if messages wait for buffers)"
-                               "\n", libcfs_nid2str(conn->ibc_peer->ibp_nid),
-                               libcfs_nid2str(conn->ibc_peer->ibp_nid));
+                LCONSOLE_ERROR_MSG(0x129, "Dropping message from %s: no buffers"
+                                   " free. %s is running an old version of LNET "
+                                   "that may deadlock if messages wait for"
+                                   "buffers) \n", 
+                                   libcfs_nid2str(conn->ibc_peer->ibp_nid),
+                                   libcfs_nid2str(conn->ibc_peer->ibp_nid));
                 return -EDEADLK;
         }
         
index 9514e1b..784a583 100644 (file)
@@ -527,7 +527,8 @@ EXPORT_SYMBOL(libcfs_setnet0alias);
 void
 libcfs_setnet0alias(int lnd)
 {
-        LCONSOLE_ERROR(0x125, "Liblustre cannot interoperate with old Portals."
-                       "\nportals_compatibility must be set to 'none'.\n");
+        LCONSOLE_ERROR_MSG(0x125, "Liblustre cannot interoperate with old "
+                           "Portals.\nportals_compatibility must be set to "
+                           "'none'.\n");
 }
 #endif
index 325c8b1..18e825c 100644 (file)
@@ -88,32 +88,32 @@ lnet_connect_console_error (int rc, lnet_nid_t peer_nid,
                        HIPQUAD(peer_ip), peer_port);
                 break;
         case -ECONNRESET:
-                LCONSOLE_ERROR(0x11b, "Connection to %s at host %u.%u.%u.%u on "
-                               "port %d was reset: "
-                               "is it running a compatible version of Lustre "
-                               "and is %s one of its NIDs?\n",
-                               libcfs_nid2str(peer_nid),
-                               HIPQUAD(peer_ip), peer_port,
-                               libcfs_nid2str(peer_nid));
+                LCONSOLE_ERROR_MSG(0x11b, "Connection to %s at host %u.%u.%u.%u"
+                                   " on port %d was reset: "
+                                   "is it running a compatible version of "
+                                   "Lustre and is %s one of its NIDs?\n",
+                                   libcfs_nid2str(peer_nid),
+                                   HIPQUAD(peer_ip), peer_port,
+                                   libcfs_nid2str(peer_nid));
                 break;
         case -EPROTO:
-                LCONSOLE_ERROR(0x11c, "Protocol error connecting to %s at host "
-                               "%u.%u.%u.%u on port %d: "
-                               "is it running a compatible version of Lustre?\n",
-                               libcfs_nid2str(peer_nid),
-                               HIPQUAD(peer_ip), peer_port);
+                LCONSOLE_ERROR_MSG(0x11c, "Protocol error connecting to %s at "
+                                   "host %u.%u.%u.%u on port %d: is it running "
+                                   "a compatible version of Lustre?\n",
+                                   libcfs_nid2str(peer_nid),
+                                   HIPQUAD(peer_ip), peer_port);
                 break;
         case -EADDRINUSE:
-                LCONSOLE_ERROR(0x11d, "No privileged ports available to connect to "
-                               "%s at host %u.%u.%u.%u on port %d\n",
-                               libcfs_nid2str(peer_nid),
-                               HIPQUAD(peer_ip), peer_port);
+                LCONSOLE_ERROR_MSG(0x11d, "No privileged ports available to "
+                                   "connect to %s at host %u.%u.%u.%u on port "
+                                   "%d\n", libcfs_nid2str(peer_nid),
+                                   HIPQUAD(peer_ip), peer_port);
                 break;
         default:
-                LCONSOLE_ERROR(0x11e, "Unexpected error %d connecting to %s at "
-                               "host %u.%u.%u.%u on port %d\n", rc,
-                               libcfs_nid2str(peer_nid),
-                               HIPQUAD(peer_ip), peer_port);
+                LCONSOLE_ERROR_MSG(0x11e, "Unexpected error %d connecting to %s"
+                                   " at host %u.%u.%u.%u on port %d\n", rc,
+                                   libcfs_nid2str(peer_nid),
+                                   HIPQUAD(peer_ip), peer_port);
                 break;
         }
 }
@@ -249,9 +249,9 @@ lnet_accept(lnet_ni_t *blind_ni, cfs_socket_t *sock, __u32 magic)
                 else
                         str = "unrecognised";
             
-                LCONSOLE_ERROR(0x11f, "Refusing connection from %u.%u.%u.%u magic %08x: "
-                               " %s acceptor protocol\n",
-                               HIPQUAD(peer_ip), magic, str);
+                LCONSOLE_ERROR_MSG(0x11f, "Refusing connection from %u.%u.%u.%u"
+                                   " magic %08x: %s acceptor protocol\n",
+                                   HIPQUAD(peer_ip), magic, str);
                 return -EPROTO;
         }
 
@@ -308,18 +308,18 @@ lnet_accept(lnet_ni_t *blind_ni, cfs_socket_t *sock, __u32 magic)
             ni->ni_nid != cr.acr_nid) { /* right NET, wrong NID! */
                 if (ni != NULL)
                         lnet_ni_decref(ni);
-                LCONSOLE_ERROR(0x120, "Refusing connection from %u.%u.%u.%u for %s: "
-                               " No matching NI\n",
-                               HIPQUAD(peer_ip), libcfs_nid2str(cr.acr_nid));
+                LCONSOLE_ERROR_MSG(0x120, "Refusing connection from %u.%u.%u.%u"
+                                   " for %s: No matching NI\n",
+                                   HIPQUAD(peer_ip), libcfs_nid2str(cr.acr_nid));
                 return -EPERM;
         }
 
         if (ni->ni_lnd->lnd_accept == NULL) {
                 /* This catches a request for the loopback LND */
                 lnet_ni_decref(ni);
-                LCONSOLE_ERROR(0x121, "Refusing connection from %u.%u.%u.%u for %s: "
-                               " NI doesn not accept IP connections\n",
-                               HIPQUAD(peer_ip), libcfs_nid2str(cr.acr_nid));
+                LCONSOLE_ERROR_MSG(0x121, "Refusing connection from %u.%u.%u.%u"
+                                  " for %s: NI doesn not accept IP connections\n",
+                                  HIPQUAD(peer_ip), libcfs_nid2str(cr.acr_nid));
                 return -EPERM;
         }
 
@@ -377,13 +377,13 @@ lnet_acceptor(void *arg)
                                0, accept_port, accept_backlog);
        if (rc != 0) {
                 if (rc == -EADDRINUSE)
-                        LCONSOLE_ERROR(0x122, "Can't start acceptor on port %d: "
-                                       "port already in use\n",
-                                       accept_port);
+                        LCONSOLE_ERROR_MSG(0x122, "Can't start acceptor on port"
+                                           " %d: port already in use\n",
+                                           accept_port);
                 else
-                        LCONSOLE_ERROR(0x123, "Can't start acceptor on port %d: "
-                                       "unexpected error %d\n",
-                                       accept_port, rc);
+                        LCONSOLE_ERROR_MSG(0x123, "Can't start acceptor on port "
+                                           "%d: unexpected error %d\n",
+                                           accept_port, rc);
 
                lnet_acceptor_state.pta_sock = NULL;
         } else {
@@ -482,8 +482,8 @@ lnet_acceptor_start(void)
         } else if (!strcmp(accept, "none")) {
                 return 0;
         } else {
-                LCONSOLE_ERROR (0x124, "Can't parse 'accept=\"%s\"'\n",
-                                accept);
+                LCONSOLE_ERROR_MSG(0x124, "Can't parse 'accept=\"%s\"'\n",
+                                   accept);
                 return -EINVAL;
         }
        
index adb4ef1..f341cd8 100644 (file)
@@ -61,8 +61,8 @@ lnet_get_networks(void)
         int     rc;
 
         if (*networks != 0 && *ip2nets != 0) {
-                LCONSOLE_ERROR(0x101, "Please specify EITHER 'networks' or "
-                               "'ip2nets' but not both at once\n");
+                LCONSOLE_ERROR_MSG(0x101, "Please specify EITHER 'networks' or "
+                                   "'ip2nets' but not both at once\n");
                 return NULL;
         }
         
@@ -94,8 +94,8 @@ lnet_get_portals_compatibility(void)
                 LCONSOLE_WARN("Starting in strong portals-compatible mode\n");
         } 
 
-        LCONSOLE_ERROR(0x102, "portals_compatibility=\"%s\" not supported\n",
-                       portals_compatibility);
+        LCONSOLE_ERROR_MSG(0x102, "portals_compatibility=\"%s\" not supported\n",
+                           portals_compatibility);
         return -EINVAL;
 }
 
@@ -138,8 +138,8 @@ lnet_get_networks (void)
 
 #ifdef NOT_YET
         if (networks != NULL && ip2nets != NULL) {
-                LCONSOLE_ERROR(0x103, "Please set EITHER 'LNET_NETWORKS' or "
-                               "'LNET_IP2NETS' but not both at once\n");
+                LCONSOLE_ERROR_MSG(0x103, "Please set EITHER 'LNET_NETWORKS' or"
+                                   " 'LNET_IP2NETS' but not both at once\n");
                 return NULL;
         }
 
@@ -1002,7 +1002,7 @@ lnet_startup_lndnis (void)
                                        libcfs_lnd2str(lnd_type),
                                        libcfs_lnd2modname(lnd_type), rc);
 #ifndef CONFIG_KMOD
-                                LCONSOLE_ERROR(0x104, "Your kernel must be "
+                                LCONSOLE_ERROR_MSG(0x104, "Your kernel must be "
                                          "compiled with CONFIG_KMOD set for "
                                          "automatic module loading.");
 #endif
@@ -1031,8 +1031,9 @@ lnet_startup_lndnis (void)
                 LNET_MUTEX_UP(&the_lnet.ln_lnd_mutex);
 
                 if (rc != 0) {
-                        LCONSOLE_ERROR(0x105, "Error %d starting up LNI %s\n",
-                                       rc, libcfs_lnd2str(lnd->lnd_type));
+                        LCONSOLE_ERROR_MSG(0x105, "Error %d starting up LNI %s"
+                                           "\n",
+                                           rc, libcfs_lnd2str(lnd->lnd_type));
                         LNET_LOCK();
                         lnd->lnd_refcount--;
                         LNET_UNLOCK();
@@ -1060,19 +1061,19 @@ lnet_startup_lndnis (void)
                         }
                 } else {
 # ifndef HAVE_LIBPTHREAD
-                        LCONSOLE_ERROR(0x106, "LND %s not supported in a "
-                                       "single-threaded runtime\n",
-                                       libcfs_lnd2str(lnd_type));
+                        LCONSOLE_ERROR_MSG(0x106, "LND %s not supported in a "
+                                           "single-threaded runtime\n",
+                                           libcfs_lnd2str(lnd_type));
                         goto failed;
 # endif
                 }
 #endif
                 if (ni->ni_peertxcredits == 0 ||
                     ni->ni_maxtxcredits == 0) {
-                        LCONSOLE_ERROR(0x107, "LNI %s has no %scredits\n",
-                                       libcfs_lnd2str(lnd->lnd_type),
-                                       ni->ni_peertxcredits == 0 ?
-                                       "" : "per-peer ");
+                        LCONSOLE_ERROR_MSG(0x107, "LNI %s has no %scredits\n",
+                                           libcfs_lnd2str(lnd->lnd_type),
+                                           ni->ni_peertxcredits == 0 ?
+                                           "" : "per-peer ");
                         goto failed;
                 }
 
@@ -1085,8 +1086,9 @@ lnet_startup_lndnis (void)
                 /* Handle nidstrings for network 0 just like this one */
                 if (the_lnet.ln_ptlcompat > 0) {
                         if (nicount > 0) {
-                                LCONSOLE_ERROR(0x108, "Can't run > 1 network "
-                                       "when portals_compatibility is set\n");
+                                LCONSOLE_ERROR_MSG(0x108, "Can't run > 1 "
+                                       "network when portals_compatibility is "
+                                       "set\n");
                                 goto failed;
                         }
                         libcfs_setnet0alias(lnd->lnd_type);
@@ -1097,8 +1099,9 @@ lnet_startup_lndnis (void)
 
         if (the_lnet.ln_eqwaitni != NULL && nicount > 1) {
                 lnd_type = the_lnet.ln_eqwaitni->ni_lnd->lnd_type;
-                LCONSOLE_ERROR(0x109, "LND %s can only run single-network\n",
-                               libcfs_lnd2str(lnd_type));
+                LCONSOLE_ERROR_MSG(0x109, "LND %s can only run single-network"
+                                   "\n",
+                                   libcfs_lnd2str(lnd_type));
                 goto failed;
         }
 
index 7c1466c..7bb8799 100644 (file)
@@ -52,10 +52,10 @@ lnet_syntax(char *name, char *str, int offset, int width)
         memset(dashes, '-', sizeof(dashes));
         dashes[sizeof(dashes)-1] = 0;
         
-       LCONSOLE_ERROR(0x10f, "Error parsing '%s=\"%s\"'\n", name, str);
-       LCONSOLE_ERROR(0x110, "here...........%.*s..%.*s|%.*s|\n", 
-                       (int)strlen(name), dots, offset, dots,
-                       (width < 1) ? 0 : width - 1, dashes);
+       LCONSOLE_ERROR_MSG(0x10f, "Error parsing '%s=\"%s\"'\n", name, str);
+       LCONSOLE_ERROR_MSG(0x110, "here...........%.*s..%.*s|%.*s|\n", 
+                           (int)strlen(name), dots, offset, dots,
+                            (width < 1) ? 0 : width - 1, dashes);
 }
 
 int 
@@ -126,8 +126,8 @@ lnet_new_ni(__u32 net, struct list_head *nilist)
         lnet_ni_t *ni;
 
         if (!lnet_net_unique(net, nilist)) {
-                LCONSOLE_ERROR(0x111, "Duplicate network specified: %s\n",
-                               libcfs_net2str(net));
+                LCONSOLE_ERROR_MSG(0x111, "Duplicate network specified: %s\n",
+                                   libcfs_net2str(net));
                 return NULL;
         }
         
@@ -161,7 +161,8 @@ lnet_parse_networks(struct list_head *nilist, char *networks)
 
        if (strlen(networks) > LNET_SINGLE_TEXTBUF_NOB) {
                /* _WAY_ conservative */
-               LCONSOLE_ERROR(0x112, "Can't parse networks: string too long\n");
+               LCONSOLE_ERROR_MSG(0x112, "Can't parse networks: string too "
+                                   "long\n");
                return -EINVAL;
        }
 
@@ -202,7 +203,8 @@ lnet_parse_networks(struct list_head *nilist, char *networks)
                        if (net == LNET_NIDNET(LNET_NID_ANY)) {
                                 lnet_syntax("networks", networks, 
                                             str - tokens, strlen(str));
-                                LCONSOLE_ERROR(0x113, "Unrecognised network type\n");
+                                LCONSOLE_ERROR_MSG(0x113, "Unrecognised network"
+                                                   " type\n");
                                 goto failed;
                         }
 
@@ -224,8 +226,8 @@ lnet_parse_networks(struct list_head *nilist, char *networks)
 
                 if (nnets > 0 &&
                     the_lnet.ln_ptlcompat > 0) {
-                        LCONSOLE_ERROR(0x114, "Only 1 network supported when "
-                                       "'portals_compatible' is set\n");
+                        LCONSOLE_ERROR_MSG(0x114, "Only 1 network supported when"
+                                           " 'portals_compatible' is set\n");
                         goto failed;
                 }
 
@@ -258,8 +260,9 @@ lnet_parse_networks(struct list_head *nilist, char *networks)
                         }
 
                         if (niface == LNET_MAX_INTERFACES) {
-                                LCONSOLE_ERROR(0x115, "Too many interfaces for net %s\n",
-                                               libcfs_net2str(net));
+                                LCONSOLE_ERROR_MSG(0x115, "Too many interfaces "
+                                                   "for net %s\n",
+                                                   libcfs_net2str(net));
                                 goto failed;
                         }
 
@@ -713,8 +716,8 @@ lnet_parse_routes (char *routes, int *im_a_router)
         if (the_lnet.ln_ptlcompat > 0 && 
             routes[0] != 0) {
                 /* Can't route when running in compatibility mode */
-                LCONSOLE_ERROR(0x116, "Route tables are not supported when "
-                               "'portals_compatible' is set\n");
+                LCONSOLE_ERROR_MSG(0x116, "Route tables are not supported when "
+                                   "'portals_compatible' is set\n");
                 return -EINVAL;
         }
         
@@ -1276,14 +1279,14 @@ lnet_parse_ip2nets (char **networksp, char *ip2nets)
         int        rc;
 
         if (nip < 0) {
-                LCONSOLE_ERROR(0x117, "Error %d enumerating local IP interfaces "
-                               "for ip2nets to match\n", nip);
+                LCONSOLE_ERROR_MSG(0x117, "Error %d enumerating local IP "
+                                   "interfaces for ip2nets to match\n", nip);
                 return nip;
         }
 
         if (nip == 0) {
-                LCONSOLE_ERROR(0x118, "No local IP interfaces "
-                               "for ip2nets to match\n");
+                LCONSOLE_ERROR_MSG(0x118, "No local IP interfaces "
+                                   "for ip2nets to match\n");
                 return -ENOENT;
         }
 
@@ -1291,13 +1294,13 @@ lnet_parse_ip2nets (char **networksp, char *ip2nets)
         lnet_ipaddr_free_enumeration(ipaddrs, nip);
 
         if (rc < 0) {
-                LCONSOLE_ERROR(0x119, "Error %d parsing ip2nets\n", rc);
+                LCONSOLE_ERROR_MSG(0x119, "Error %d parsing ip2nets\n", rc);
                 return rc;
         }
 
         if (rc == 0) {
-                LCONSOLE_ERROR(0x11a, "ip2nets does not match "
-                               "any local IP interfaces\n");
+                LCONSOLE_ERROR_MSG(0x11a, "ip2nets does not match "
+                                   "any local IP interfaces\n");
                 return -ENOENT;
         }
 
index 0cf26d8..a46fe32 100644 (file)
@@ -782,8 +782,9 @@ lnet_router_checker_start(void)
 
         if (check_routers_before_use &&
             dead_router_check_interval <= 0) {
-                LCONSOLE_ERROR(0x10a, "'dead_router_check_interval' must be set if "
-                               "'check_routers_before_use' is set\n");
+                LCONSOLE_ERROR_MSG(0x10a, "'dead_router_check_interval' must be"
+                                   " set if 'check_routers_before_use' is set"
+                                   "\n");
                 return -EINVAL;
         }
         
@@ -981,14 +982,14 @@ lnet_alloc_rtrpools(int im_a_router)
         } else if (!strcmp(forwarding, "enabled")) {
                 /* explicitly enabled */
         } else {
-                LCONSOLE_ERROR(0x10b, "'forwarding' not set to either "
-                               "'enabled' or 'disabled'\n");
+                LCONSOLE_ERROR_MSG(0x10b, "'forwarding' not set to either "
+                                   "'enabled' or 'disabled'\n");
                 return -EINVAL;
         }
         
         if (tiny_router_buffers <= 0) {
-                LCONSOLE_ERROR(0x10c, "tiny_router_buffers=%d invalid when "
-                               "routing enabled\n", tiny_router_buffers);
+                LCONSOLE_ERROR_MSG(0x10c, "tiny_router_buffers=%d invalid when "
+                                   "routing enabled\n", tiny_router_buffers);
                 rc = -EINVAL;
                 goto failed;
         }
@@ -999,8 +1000,8 @@ lnet_alloc_rtrpools(int im_a_router)
                 goto failed;
 
         if (small_router_buffers <= 0) {
-                LCONSOLE_ERROR(0x10d, "small_router_buffers=%d invalid when "
-                               "routing enabled\n", small_router_buffers);
+                LCONSOLE_ERROR_MSG(0x10d, "small_router_buffers=%d invalid when"
+                                   " routing enabled\n", small_router_buffers);
                 rc = -EINVAL;
                 goto failed;
         }
@@ -1011,8 +1012,8 @@ lnet_alloc_rtrpools(int im_a_router)
                 goto failed;
 
         if (large_router_buffers <= 0) {
-                LCONSOLE_ERROR(0x10e, "large_router_buffers=%d invalid when "
-                               "routing enabled\n", large_router_buffers);
+                LCONSOLE_ERROR_MSG(0x10e, "large_router_buffers=%d invalid when"
+                                   " routing enabled\n", large_router_buffers);
                 rc = -EINVAL;
                 goto failed;
         }