X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fconnection.c;h=a41b2021d6ea3ed7eb6172503f8c100d0df828b7;hb=381604f44423893522517e2058237d8a1354e924;hp=fb86c6cf9a2ba882980f2aecc4a4ad37a7504707;hpb=7acbb798340cc97468f1e362134a2633c0a5a6d8;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/connection.c b/lustre/ptlrpc/connection.c index fb86c6c..a41b202 100644 --- a/lustre/ptlrpc/connection.c +++ b/lustre/ptlrpc/connection.c @@ -44,10 +44,9 @@ #endif #include "ptlrpc_internal.h" -#include -static lustre_hash_t *conn_hash = NULL; -static lustre_hash_ops_t conn_hash_ops; +static cfs_hash_t *conn_hash = NULL; +static cfs_hash_ops_t conn_hash_ops; struct ptlrpc_connection * ptlrpc_connection_get(lnet_process_id_t peer, lnet_nid_t self, @@ -56,7 +55,7 @@ ptlrpc_connection_get(lnet_process_id_t peer, lnet_nid_t self, struct ptlrpc_connection *conn, *conn2; ENTRY; - conn = lustre_hash_lookup(conn_hash, &peer); + conn = cfs_hash_lookup(conn_hash, &peer); if (conn) GOTO(out, conn); @@ -66,18 +65,18 @@ ptlrpc_connection_get(lnet_process_id_t peer, lnet_nid_t self, conn->c_peer = peer; conn->c_self = self; - INIT_HLIST_NODE(&conn->c_hash); - atomic_set(&conn->c_refcount, 1); + CFS_INIT_HLIST_NODE(&conn->c_hash); + cfs_atomic_set(&conn->c_refcount, 1); if (uuid) obd_str2uuid(&conn->c_remote_uuid, uuid->uuid); - /* + /* * Add the newly created conn to the hash, on key collision we * lost a racing addition and must destroy our newly allocated * connection. The object which exists in the has will be - * returned and may be compared against out object. + * returned and may be compared against out object. */ - conn2 = lustre_hash_findadd_unique(conn_hash, &peer, &conn->c_hash); + conn2 = cfs_hash_findadd_unique(conn_hash, &peer, &conn->c_hash); if (conn != conn2) { OBD_FREE_PTR(conn); conn = conn2; @@ -85,75 +84,77 @@ ptlrpc_connection_get(lnet_process_id_t peer, lnet_nid_t self, EXIT; out: CDEBUG(D_INFO, "conn=%p refcount %d to %s\n", - conn, atomic_read(&conn->c_refcount), + conn, cfs_atomic_read(&conn->c_refcount), libcfs_nid2str(conn->c_peer.nid)); return conn; } - + int ptlrpc_connection_put(struct ptlrpc_connection *conn) { int rc = 0; ENTRY; - + if (!conn) RETURN(rc); - - LASSERT(!hlist_unhashed(&conn->c_hash)); - + + LASSERT(!cfs_hlist_unhashed(&conn->c_hash)); + /* - * We do not remove connection from hashtable and + * We do not remove connection from hashtable and * do not free it even if last caller released ref, * as we want to have it cached for the case it is * needed again. * * Deallocating it and later creating new connection * again would be wastful. This way we also avoid - * expensive locking to protect things from get/put - * race when found cached connection is freed by + * expensive locking to protect things from get/put + * race when found cached connection is freed by * ptlrpc_connection_put(). * * It will be freed later in module unload time, * when ptlrpc_connection_fini()->lh_exit->conn_exit() * path is called. */ - if (atomic_dec_return(&conn->c_refcount) == 1) + if (cfs_atomic_dec_return(&conn->c_refcount) == 1) rc = 1; CDEBUG(D_INFO, "PUT conn=%p refcount %d to %s\n", - conn, atomic_read(&conn->c_refcount), + conn, cfs_atomic_read(&conn->c_refcount), libcfs_nid2str(conn->c_peer.nid)); RETURN(rc); } - + struct ptlrpc_connection * ptlrpc_connection_addref(struct ptlrpc_connection *conn) { ENTRY; - atomic_inc(&conn->c_refcount); + cfs_atomic_inc(&conn->c_refcount); CDEBUG(D_INFO, "conn=%p refcount %d to %s\n", - conn, atomic_read(&conn->c_refcount), + conn, cfs_atomic_read(&conn->c_refcount), libcfs_nid2str(conn->c_peer.nid)); RETURN(conn); } - + int ptlrpc_connection_init(void) { ENTRY; - conn_hash = lustre_hash_init("CONN_HASH", 5, 15, - &conn_hash_ops, LH_REHASH); + conn_hash = cfs_hash_create("CONN_HASH", + HASH_CONN_CUR_BITS, + HASH_CONN_MAX_BITS, + &conn_hash_ops, CFS_HASH_REHASH); if (!conn_hash) RETURN(-ENOMEM); - + RETURN(0); } - + void ptlrpc_connection_fini(void) { ENTRY; - lustre_hash_exit(conn_hash); + cfs_hash_destroy(conn_hash); EXIT; } @@ -161,77 +162,77 @@ void ptlrpc_connection_fini(void) { * Hash operations for net_peer<->connection */ static unsigned -conn_hashfn(lustre_hash_t *lh, void *key, unsigned mask) +conn_hashfn(cfs_hash_t *hs, void *key, unsigned mask) { - return lh_djb2_hash(key, sizeof(lnet_process_id_t), mask); + return cfs_hash_djb2_hash(key, sizeof(lnet_process_id_t), mask); } static int -conn_compare(void *key, struct hlist_node *hnode) +conn_compare(void *key, cfs_hlist_node_t *hnode) { struct ptlrpc_connection *conn; lnet_process_id_t *conn_key; LASSERT(key != NULL); conn_key = (lnet_process_id_t*)key; - conn = hlist_entry(hnode, struct ptlrpc_connection, c_hash); + conn = cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash); return conn_key->nid == conn->c_peer.nid && conn_key->pid == conn->c_peer.pid; } static void * -conn_key(struct hlist_node *hnode) +conn_key(cfs_hlist_node_t *hnode) { struct ptlrpc_connection *conn; - conn = hlist_entry(hnode, struct ptlrpc_connection, c_hash); + conn = cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash); return &conn->c_peer; } static void * -conn_get(struct hlist_node *hnode) +conn_get(cfs_hlist_node_t *hnode) { struct ptlrpc_connection *conn; - conn = hlist_entry(hnode, struct ptlrpc_connection, c_hash); - atomic_inc(&conn->c_refcount); + conn = cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash); + cfs_atomic_inc(&conn->c_refcount); return conn; } static void * -conn_put(struct hlist_node *hnode) +conn_put(cfs_hlist_node_t *hnode) { struct ptlrpc_connection *conn; - conn = hlist_entry(hnode, struct ptlrpc_connection, c_hash); - atomic_dec(&conn->c_refcount); + conn = cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash); + cfs_atomic_dec(&conn->c_refcount); return conn; } static void -conn_exit(struct hlist_node *hnode) +conn_exit(cfs_hlist_node_t *hnode) { struct ptlrpc_connection *conn; - conn = hlist_entry(hnode, struct ptlrpc_connection, c_hash); - /* + conn = cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash); + /* * Nothing should be left. Connection user put it and * connection also was deleted from table by this time * so we should have 0 refs. */ - LASSERTF(atomic_read(&conn->c_refcount) == 0, - "Busy connection with %d refs\n", - atomic_read(&conn->c_refcount)); + LASSERTF(cfs_atomic_read(&conn->c_refcount) == 0, + "Busy connection with %d refs\n", + cfs_atomic_read(&conn->c_refcount)); OBD_FREE_PTR(conn); } -static lustre_hash_ops_t conn_hash_ops = { - .lh_hash = conn_hashfn, - .lh_compare = conn_compare, - .lh_key = conn_key, - .lh_get = conn_get, - .lh_put = conn_put, - .lh_exit = conn_exit, +static cfs_hash_ops_t conn_hash_ops = { + .hs_hash = conn_hashfn, + .hs_compare = conn_compare, + .hs_key = conn_key, + .hs_get = conn_get, + .hs_put = conn_put, + .hs_exit = conn_exit, };