r=adilger

[fs/lustre-release.git] / lustre / ptlrpc / connection.c

diff --git a/lustre/ptlrpc/connection.c b/lustre/ptlrpc/connection.c
index 2458b08..9e19704 100644 (file)
--- a/lustre/ptlrpc/connection.c
+++ b/lustre/ptlrpc/connection.c
@@ -21,42 +21,54 @@
  */
 
 #define DEBUG_SUBSYSTEM S_RPC
-
+#ifdef __KERNEL__
 #include <linux/obd_support.h>
 #include <linux/obd_class.h>
 #include <linux/lustre_net.h>
+#else
+#include <liblustre.h>
+#endif
+
+#include "ptlrpc_internal.h"
 
 static spinlock_t conn_lock;
 static struct list_head conn_list;
 static struct list_head conn_unused_list;
 
-/* If UUID is NULL, c->c_remote_uuid must be all zeroes
- * If UUID is non-NULL, c->c_remote_uuid must match. */
-static int match_connection_uuid(struct ptlrpc_connection *c, obd_uuid_t uuid)
+void ptlrpc_dump_connections(void)
 {
-        obd_uuid_t zero_uuid = {0};
-
-        if (uuid)
-                return memcmp(c->c_remote_uuid, uuid, sizeof(uuid));
+        char str[PTL_NALFMT_SIZE];
+        struct list_head *tmp;
+        struct ptlrpc_connection *c;
+        ENTRY;
 
-        return memcmp(c->c_remote_uuid, zero_uuid, sizeof(zero_uuid));
+        list_for_each(tmp, &conn_list) {
+                c = list_entry(tmp, struct ptlrpc_connection, c_link);
+                CERROR("Connection %p/%s has refcount %d (nid=%s on %s)\n",
+                       c, c->c_remote_uuid.uuid, atomic_read(&c->c_refcount),
+                       ptlrpc_peernid2str(&c->c_peer, str),
+                       c->c_peer.peer_ni->pni_name);
+        }
+        EXIT;
 }
 
-struct ptlrpc_connection *ptlrpc_get_connection(struct lustre_peer *peer,
-                                                obd_uuid_t uuid)
+struct ptlrpc_connection *ptlrpc_get_connection(struct ptlrpc_peer *peer,
+                                                struct obd_uuid *uuid)
 {
+        char str[PTL_NALFMT_SIZE];
         struct list_head *tmp, *pos;
         struct ptlrpc_connection *c;
         ENTRY;
 
-        CDEBUG(D_INFO, "peer is %08x %08lx %08lx\n",
-               peer->peer_nid, peer->peer_ni.nal_idx, peer->peer_ni.handle_idx);
+
+        CDEBUG(D_INFO, "peer is %s on %s\n",
+               ptlrpc_id2str(peer, str), peer->peer_ni->pni_name);
 
         spin_lock(&conn_lock);
         list_for_each(tmp, &conn_list) {
                 c = list_entry(tmp, struct ptlrpc_connection, c_link);
                 if (memcmp(peer, &c->c_peer, sizeof(*peer)) == 0 &&
-                    !match_connection_uuid(c, uuid)) {
+                    peer->peer_ni == c->c_peer.peer_ni) {
                         ptlrpc_connection_addref(c);
                         GOTO(out, c);
                 }
@@ -65,7 +77,7 @@ struct ptlrpc_connection *ptlrpc_get_connection(struct lustre_peer *peer,
         list_for_each_safe(tmp, pos, &conn_unused_list) {
                 c = list_entry(tmp, struct ptlrpc_connection, c_link);
                 if (memcmp(peer, &c->c_peer, sizeof(*peer)) == 0 &&
-                    !match_connection_uuid(c, uuid)) {
+                    peer->peer_ni == c->c_peer.peer_ni) {
                         ptlrpc_connection_addref(c);
                         list_del(&c->c_link);
                         list_add(&c->c_link, &conn_list);
@@ -75,27 +87,18 @@ struct ptlrpc_connection *ptlrpc_get_connection(struct lustre_peer *peer,
 
         /* FIXME: this should be a slab once we can validate slab addresses
          * without OOPSing */
-        OBD_ALLOC(c, sizeof(*c));
+        OBD_ALLOC_GFP(c, sizeof(*c), GFP_ATOMIC);
+       
         if (c == NULL)
                 GOTO(out, c);
 
-        c->c_level = LUSTRE_CONN_NEW;
-        c->c_generation = 1;
-        c->c_epoch = 1;
-        c->c_bootcount = 0;
-        c->c_flags = 0;
-        if (uuid)
-                strcpy(c->c_remote_uuid, uuid);
-        INIT_LIST_HEAD(&c->c_imports);
-        INIT_LIST_HEAD(&c->c_exports);
-        INIT_LIST_HEAD(&c->c_sb_chain);
-        INIT_LIST_HEAD(&c->c_recovd_data.rd_managed_chain);
-        INIT_LIST_HEAD(&c->c_delayed_head);
+        if (uuid && uuid->uuid)                         /* XXX ???? */
+                obd_str2uuid(&c->c_remote_uuid, (char *)uuid->uuid);
         atomic_set(&c->c_refcount, 0);
+        memcpy(&c->c_peer, peer, sizeof(c->c_peer));
+
         ptlrpc_connection_addref(c);
-        spin_lock_init(&c->c_lock);
 
-        memcpy(&c->c_peer, peer, sizeof(c->c_peer));
         list_add(&c->c_link, &conn_list);
 
         EXIT;
@@ -106,6 +109,7 @@ struct ptlrpc_connection *ptlrpc_get_connection(struct lustre_peer *peer,
 
 int ptlrpc_put_connection(struct ptlrpc_connection *c)
 {
+        char str[PTL_NALFMT_SIZE];
         int rc = 0;
         ENTRY;
 
@@ -114,10 +118,12 @@ int ptlrpc_put_connection(struct ptlrpc_connection *c)
                 RETURN(0);
         }
 
-        CDEBUG(D_INFO, "connection=%p refcount %d\n",
-               c, atomic_read(&c->c_refcount) - 1);
+        CDEBUG (D_INFO, "connection=%p refcount %d to %s on %s\n",
+                c, atomic_read(&c->c_refcount) - 1, 
+                ptlrpc_peernid2str(&c->c_peer, str),
+                c->c_peer.peer_ni->pni_name);
+
         if (atomic_dec_and_test(&c->c_refcount)) {
-                recovd_conn_unmanage(c);
                 spin_lock(&conn_lock);
                 list_del(&c->c_link);
                 list_add(&c->c_link, &conn_unused_list);
@@ -133,10 +139,13 @@ int ptlrpc_put_connection(struct ptlrpc_connection *c)
 
 struct ptlrpc_connection *ptlrpc_connection_addref(struct ptlrpc_connection *c)
 {
+        char str[PTL_NALFMT_SIZE];
         ENTRY;
-        CDEBUG(D_INFO, "connection=%p refcount %d\n",
-               c, atomic_read(&c->c_refcount) + 1);
         atomic_inc(&c->c_refcount);
+        CDEBUG (D_INFO, "connection=%p refcount %d to %s on %s\n",
+                c, atomic_read(&c->c_refcount),
+                ptlrpc_peernid2str(&c->c_peer, str),
+                c->c_peer.peer_ni->pni_name);
         RETURN(c);
 }
 
@@ -149,6 +158,7 @@ void ptlrpc_init_connection(void)
 
 void ptlrpc_cleanup_connection(void)
 {
+        char str[PTL_NALFMT_SIZE];
         struct list_head *tmp, *pos;
         struct ptlrpc_connection *c;
 
@@ -160,9 +170,10 @@ void ptlrpc_cleanup_connection(void)
         }
         list_for_each_safe(tmp, pos, &conn_list) {
                 c = list_entry(tmp, struct ptlrpc_connection, c_link);
-                CERROR("Connection %p/%s has refcount %d (nid=%lu)\n",
-                       c, c->c_remote_uuid, atomic_read(&c->c_refcount),
-                       (unsigned long)c->c_peer.peer_nid);
+                CERROR("Connection %p/%s has refcount %d (nid=%s on %s)\n",
+                       c, c->c_remote_uuid.uuid, atomic_read(&c->c_refcount),
+                       ptlrpc_peernid2str(&c->c_peer, str),
+                       c->c_peer.peer_ni->pni_name);
                 list_del(&c->c_link);
                 OBD_FREE(c, sizeof(*c));
         }