X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fconnection.c;h=466916b53879c1418219a3e293488a08dcc4a0a1;hb=ff17cc7e0282d9b1522810e0c5d12171c4d46a2d;hp=2458b081622bf8277f67a4f878dd7cff087ecfb4;hpb=4d477d1468cf4be4c37681610b3d726fd27f229f;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/connection.c b/lustre/ptlrpc/connection.c index 2458b08..466916b 100644 --- a/lustre/ptlrpc/connection.c +++ b/lustre/ptlrpc/connection.c @@ -21,42 +21,51 @@ */ #define DEBUG_SUBSYSTEM S_RPC - +#ifdef __KERNEL__ #include #include #include +#else +#include +#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)); + 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="LPX64" 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); + } + 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) { 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 "LPX64" on %s\n", + peer->peer_nid, 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)) { + if (peer->peer_nid == c->c_peer.peer_nid && + peer->peer_ni == c->c_peer.peer_ni) { ptlrpc_connection_addref(c); GOTO(out, c); } @@ -64,8 +73,8 @@ 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)) { + if (peer->peer_nid == c->c_peer.peer_nid && + peer->peer_ni == c->c_peer.peer_ni) { ptlrpc_connection_addref(c); list_del(&c->c_link); list_add(&c->c_link, &conn_list); @@ -79,23 +88,13 @@ struct ptlrpc_connection *ptlrpc_get_connection(struct lustre_peer *peer, 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, 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; @@ -114,10 +113,11 @@ 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 "LPX64" on %s\n", + c, atomic_read(&c->c_refcount) - 1, c->c_peer.peer_nid, + 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); @@ -134,9 +134,10 @@ int ptlrpc_put_connection(struct ptlrpc_connection *c) struct ptlrpc_connection *ptlrpc_connection_addref(struct ptlrpc_connection *c) { 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 "LPX64" on %s\n", + c, atomic_read(&c->c_refcount), c->c_peer.peer_nid, + c->c_peer.peer_ni->pni_name); RETURN(c); } @@ -160,9 +161,9 @@ 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="LPX64" 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); list_del(&c->c_link); OBD_FREE(c, sizeof(*c)); }