- many fixes in liblustre related stuff. By now liblustre is at least build-able...

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

diff --git a/lustre/ptlrpc/connection.c b/lustre/ptlrpc/connection.c
index 6b7690b..9e19704 100644 (file)
--- a/lustre/ptlrpc/connection.c
+++ b/lustre/ptlrpc/connection.c
@@ -37,15 +37,17 @@ static struct list_head conn_unused_list;
 
 void ptlrpc_dump_connections(void)
 {
+        char str[PTL_NALFMT_SIZE];
         struct list_head *tmp;
         struct ptlrpc_connection *c;
         ENTRY;
 
         list_for_each(tmp, &conn_list) {
                 c = list_entry(tmp, struct ptlrpc_connection, c_link);
-                CERROR("Connection %p/%s has refcount %d (nid="LPX64" on %s)\n",
+                CERROR("Connection %p/%s has refcount %d (nid=%s on %s)\n",
                        c, c->c_remote_uuid.uuid, atomic_read(&c->c_refcount),
-                       c->c_peer.peer_nid, c->c_peer.peer_ni->pni_name);
+                       ptlrpc_peernid2str(&c->c_peer, str),
+                       c->c_peer.peer_ni->pni_name);
         }
         EXIT;
 }
@@ -53,25 +55,19 @@ void ptlrpc_dump_connections(void)
 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 "LPX64" on %s\n",
-               peer->peer_nid, peer->peer_ni->pni_name);
+        CDEBUG(D_INFO, "peer is %s on %s\n",
+               ptlrpc_id2str(peer, str), peer->peer_ni->pni_name);
 
         spin_lock(&conn_lock);
-        if (list_empty(&conn_list)) {
-                if (!ptlrpc_get_ldlm_hooks()) {
-                        spin_unlock(&conn_lock);
-                        RETURN(NULL);
-                }
-        }
-
         list_for_each(tmp, &conn_list) {
                 c = list_entry(tmp, struct ptlrpc_connection, c_link);
-                if (peer->peer_nid == c->c_peer.peer_nid &&
+                if (memcmp(peer, &c->c_peer, sizeof(*peer)) == 0 &&
                     peer->peer_ni == c->c_peer.peer_ni) {
                         ptlrpc_connection_addref(c);
                         GOTO(out, c);
@@ -80,7 +76,7 @@ struct ptlrpc_connection *ptlrpc_get_connection(struct ptlrpc_peer *peer,
 
         list_for_each_safe(tmp, pos, &conn_unused_list) {
                 c = list_entry(tmp, struct ptlrpc_connection, c_link);
-                if (peer->peer_nid == c->c_peer.peer_nid &&
+                if (memcmp(peer, &c->c_peer, sizeof(*peer)) == 0 &&
                     peer->peer_ni == c->c_peer.peer_ni) {
                         ptlrpc_connection_addref(c);
                         list_del(&c->c_link);
@@ -91,19 +87,15 @@ struct ptlrpc_connection *ptlrpc_get_connection(struct ptlrpc_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_generation = 1;
-        c->c_epoch = 1;
-        c->c_bootcount = 0;
-        c->c_flags = 0;
         if (uuid && uuid->uuid)                         /* XXX ???? */
-                obd_str2uuid(&c->c_remote_uuid, uuid->uuid);
+                obd_str2uuid(&c->c_remote_uuid, (char *)uuid->uuid);
         atomic_set(&c->c_refcount, 0);
         memcpy(&c->c_peer, peer, sizeof(c->c_peer));
-        spin_lock_init(&c->c_lock);
 
         ptlrpc_connection_addref(c);
 
@@ -117,6 +109,7 @@ struct ptlrpc_connection *ptlrpc_get_connection(struct ptlrpc_peer *peer,
 
 int ptlrpc_put_connection(struct ptlrpc_connection *c)
 {
+        char str[PTL_NALFMT_SIZE];
         int rc = 0;
         ENTRY;
 
@@ -125,17 +118,15 @@ int ptlrpc_put_connection(struct ptlrpc_connection *c)
                 RETURN(0);
         }
 
-        CDEBUG (D_INFO, "connection=%p refcount %d to "LPX64" on %s\n",
-                c, atomic_read(&c->c_refcount) - 1, c->c_peer.peer_nid,
+        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)) {
                 spin_lock(&conn_lock);
                 list_del(&c->c_link);
                 list_add(&c->c_link, &conn_unused_list);
-                if (list_empty(&conn_list)) {
-                        ptlrpc_put_ldlm_hooks();
-                }
                 spin_unlock(&conn_lock);
                 rc = 1;
         }
@@ -148,10 +139,12 @@ int ptlrpc_put_connection(struct ptlrpc_connection *c)
 
 struct ptlrpc_connection *ptlrpc_connection_addref(struct ptlrpc_connection *c)
 {
+        char str[PTL_NALFMT_SIZE];
         ENTRY;
         atomic_inc(&c->c_refcount);
-        CDEBUG (D_INFO, "connection=%p refcount %d to "LPX64" on %s\n",
-                c, atomic_read(&c->c_refcount), c->c_peer.peer_nid,
+        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);
 }
@@ -165,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;
 
@@ -176,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="LPX64" on %s)\n",
+                CERROR("Connection %p/%s has refcount %d (nid=%s on %s)\n",
                        c, c->c_remote_uuid.uuid, atomic_read(&c->c_refcount),
-                       c->c_peer.peer_nid, c->c_peer.peer_ni->pni_name);
+                       ptlrpc_peernid2str(&c->c_peer, str),
+                       c->c_peer.peer_ni->pni_name);
                 list_del(&c->c_link);
                 OBD_FREE(c, sizeof(*c));
         }