ptlrpc_client->cli_lock moved to ptlrpc_connection->c_lock, but I'd forgotten

to move the spin_lock_init().  Fixed.

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index e2bceff..9252705 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -51,7 +51,6 @@ void ptlrpc_init_client(struct lustre_ha_mgr *mgr, int req_portal,
                         int rep_portal, struct ptlrpc_client *cl)
 {
         memset(cl, 0, sizeof(*cl));
-        spin_lock_init(&cl->cli_lock);
         cl->cli_ha_mgr = mgr;
         if (mgr)
                 llite_ha_conn_manage(mgr, cl);

diff --git a/lustre/ptlrpc/connection.c b/lustre/ptlrpc/connection.c
index 30f7f87..7ed2e9b 100644 (file)
--- a/lustre/ptlrpc/connection.c
+++ b/lustre/ptlrpc/connection.c
@@ -67,6 +67,7 @@ struct ptlrpc_connection *ptlrpc_get_connection(struct lustre_peer *peer)
         c->c_epoch = 1;
         c->c_bootcount = 0;
         atomic_set(&c->c_refcount, 1);
+        spin_lock_init(&c->c_lock);
 
         memcpy(&c->c_peer, peer, sizeof(c->c_peer));
         list_add(&c->c_link, &conn_list);