LU-6070 libcfs: provide separate buffers for libcfs_*2str()

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

diff --git a/lustre/ptlrpc/connection.c b/lustre/ptlrpc/connection.c
index 54aaf0d..d6c1717 100644 (file)
--- a/lustre/ptlrpc/connection.c
+++ b/lustre/ptlrpc/connection.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -35,13 +35,9 @@
  */
 
 #define DEBUG_SUBSYSTEM S_RPC
-#ifdef __KERNEL__
 #include <obd_support.h>
 #include <obd_class.h>
 #include <lustre_net.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include "ptlrpc_internal.h"
 
@@ -65,7 +61,7 @@ ptlrpc_connection_get(lnet_process_id_t peer, lnet_nid_t self,
 
         conn->c_peer = peer;
         conn->c_self = self;
-        CFS_INIT_HLIST_NODE(&conn->c_hash);
+       INIT_HLIST_NODE(&conn->c_hash);
        atomic_set(&conn->c_refcount, 1);
         if (uuid)
                 obd_str2uuid(&conn->c_remote_uuid, uuid->uuid);
@@ -91,7 +87,6 @@ out:
               libcfs_nid2str(conn->c_peer.nid));
        return conn;
 }
-EXPORT_SYMBOL(ptlrpc_connection_get);
 
 int ptlrpc_connection_put(struct ptlrpc_connection *conn)
 {
@@ -128,7 +123,6 @@ int ptlrpc_connection_put(struct ptlrpc_connection *conn)
 
        RETURN(rc);
 }
-EXPORT_SYMBOL(ptlrpc_connection_put);
 
 struct ptlrpc_connection *
 ptlrpc_connection_addref(struct ptlrpc_connection *conn)
@@ -142,7 +136,6 @@ ptlrpc_connection_addref(struct ptlrpc_connection *conn)
 
        RETURN(conn);
 }
-EXPORT_SYMBOL(ptlrpc_connection_addref);
 
 int ptlrpc_connection_init(void)
 {
@@ -160,14 +153,12 @@ int ptlrpc_connection_init(void)
 
         RETURN(0);
 }
-EXPORT_SYMBOL(ptlrpc_connection_init);
 
 void ptlrpc_connection_fini(void) {
         ENTRY;
         cfs_hash_putref(conn_hash);
         EXIT;
 }
-EXPORT_SYMBOL(ptlrpc_connection_fini);
 
 /*
  * Hash operations for net_peer<->connection
@@ -175,61 +166,61 @@ EXPORT_SYMBOL(ptlrpc_connection_fini);
 static unsigned
 conn_hashfn(cfs_hash_t *hs, const void *key, unsigned mask)
 {
-        return cfs_hash_djb2_hash(key, sizeof(lnet_process_id_t), mask);
+       return cfs_hash_djb2_hash(key, sizeof(lnet_process_id_t), mask);
 }
 
 static int
-conn_keycmp(const void *key, cfs_hlist_node_t *hnode)
+conn_keycmp(const void *key, struct hlist_node *hnode)
 {
-        struct ptlrpc_connection *conn;
-        const lnet_process_id_t *conn_key;
+       struct ptlrpc_connection *conn;
+       const lnet_process_id_t *conn_key;
 
-        LASSERT(key != NULL);
-        conn_key = (lnet_process_id_t*)key;
-        conn = cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash);
+       LASSERT(key != NULL);
+       conn_key = (lnet_process_id_t *)key;
+       conn = hlist_entry(hnode, struct ptlrpc_connection, c_hash);
 
-        return conn_key->nid == conn->c_peer.nid &&
+       return conn_key->nid == conn->c_peer.nid &&
                conn_key->pid == conn->c_peer.pid;
 }
 
 static void *
-conn_key(cfs_hlist_node_t *hnode)
+conn_key(struct hlist_node *hnode)
 {
-        struct ptlrpc_connection *conn;
-        conn = cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash);
-        return &conn->c_peer;
+       struct ptlrpc_connection *conn;
+       conn = hlist_entry(hnode, struct ptlrpc_connection, c_hash);
+       return &conn->c_peer;
 }
 
 static void *
-conn_object(cfs_hlist_node_t *hnode)
+conn_object(struct hlist_node *hnode)
 {
-        return cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash);
+       return hlist_entry(hnode, struct ptlrpc_connection, c_hash);
 }
 
 static void
-conn_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
+conn_get(cfs_hash_t *hs, struct hlist_node *hnode)
 {
-        struct ptlrpc_connection *conn;
+       struct ptlrpc_connection *conn;
 
-        conn = cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash);
+       conn = hlist_entry(hnode, struct ptlrpc_connection, c_hash);
        atomic_inc(&conn->c_refcount);
 }
 
 static void
-conn_put_locked(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
+conn_put_locked(cfs_hash_t *hs, struct hlist_node *hnode)
 {
-        struct ptlrpc_connection *conn;
+       struct ptlrpc_connection *conn;
 
-        conn = cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash);
+       conn = hlist_entry(hnode, struct ptlrpc_connection, c_hash);
        atomic_dec(&conn->c_refcount);
 }
 
 static void
-conn_exit(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
+conn_exit(cfs_hash_t *hs, struct hlist_node *hnode)
 {
        struct ptlrpc_connection *conn;
 
-       conn = cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash);
+       conn = 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
@@ -242,11 +233,11 @@ conn_exit(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
 }
 
 static cfs_hash_ops_t conn_hash_ops = {
-        .hs_hash        = conn_hashfn,
-        .hs_keycmp      = conn_keycmp,
-        .hs_key         = conn_key,
-        .hs_object      = conn_object,
-        .hs_get         = conn_get,
-        .hs_put_locked  = conn_put_locked,
-        .hs_exit        = conn_exit,
+       .hs_hash        = conn_hashfn,
+       .hs_keycmp      = conn_keycmp,
+       .hs_key         = conn_key,
+       .hs_object      = conn_object,
+       .hs_get         = conn_get,
+       .hs_put_locked  = conn_put_locked,
+       .hs_exit        = conn_exit,
 };