LU-9679 lnet: use LIST_HEAD() for local lists.

[fs/lustre-release.git] / lnet / klnds / socklnd / socklnd_proto.c

diff --git a/lnet/klnds/socklnd/socklnd_proto.c b/lnet/klnds/socklnd/socklnd_proto.c
index ca106a3..c5cc07b 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_proto.c
+++ b/lnet/klnds/socklnd/socklnd_proto.c
@@ -1,14 +1,14 @@
 /*
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  *
  *   Author: Zach Brown <zab@zabbo.net>
  *   Author: Peter J. Braam <braam@clusterfs.com>
  *   Author: Phil Schwan <phil@clusterfs.com>
  *   Author: Eric Barton <eric@bartonsoftware.com>
  *
- *   This file is part of Lustre, https://wiki.hpdd.intel.com/
+ *   This file is part of Lustre, https://wiki.whamcloud.com/
  *
  *   Portals is free software; you can redistribute it and/or
  *   modify it under the terms of version 2 of the GNU General Public
@@ -407,7 +407,7 @@ ksocknal_handle_zcack(struct ksock_conn *conn, __u64 cookie1, __u64 cookie2)
        struct ksock_peer_ni *peer_ni = conn->ksnc_peer;
        struct ksock_tx *tx;
        struct ksock_tx *tmp;
-       struct list_head zlist = LIST_HEAD_INIT(zlist);
+       LIST_HEAD(zlist);
        int count;
 
         if (cookie1 == 0)
@@ -429,8 +429,7 @@ ksocknal_handle_zcack(struct ksock_conn *conn, __u64 cookie1, __u64 cookie2)
 
                 if (c == cookie1 || c == cookie2 || (cookie1 < c && c < cookie2)) {
                         tx->tx_msg.ksm_zc_cookies[0] = 0;
-                       list_del(&tx->tx_zc_list);
-                       list_add(&tx->tx_zc_list, &zlist);
+                       list_move(&tx->tx_zc_list, &zlist);
 
                         if (--count == 0)
                                 break;
@@ -457,8 +456,8 @@ ksocknal_send_hello_v1(struct ksock_conn *conn, struct ksock_hello_msg *hello)
        int rc;
        int i;
 
-       CLASSERT(sizeof(struct lnet_magicversion) ==
-                offsetof(struct lnet_hdr, src_nid));
+       BUILD_BUG_ON(sizeof(struct lnet_magicversion) !=
+                    offsetof(struct lnet_hdr, src_nid));
 
        LIBCFS_ALLOC(hdr, sizeof(*hdr));
        if (hdr == NULL) {
@@ -474,19 +473,14 @@ ksocknal_send_hello_v1(struct ksock_conn *conn, struct ksock_hello_msg *hello)
         hmv->version_major = cpu_to_le16 (KSOCK_PROTO_V1_MAJOR);
         hmv->version_minor = cpu_to_le16 (KSOCK_PROTO_V1_MINOR);
 
-        if (the_lnet.ln_testprotocompat != 0) {
-                /* single-shot proto check */
-                LNET_LOCK();
-                if ((the_lnet.ln_testprotocompat & 1) != 0) {
-                        hmv->version_major++;   /* just different! */
-                        the_lnet.ln_testprotocompat &= ~1;
-                }
-                if ((the_lnet.ln_testprotocompat & 2) != 0) {
-                        hmv->magic = LNET_PROTO_MAGIC;
-                        the_lnet.ln_testprotocompat &= ~2;
-                }
-                LNET_UNLOCK();
-        }
+       if (the_lnet.ln_testprotocompat) {
+               /* single-shot proto check */
+               if (test_and_clear_bit(0, &the_lnet.ln_testprotocompat))
+                       hmv->version_major++;   /* just different! */
+
+               if (test_and_clear_bit(1, &the_lnet.ln_testprotocompat))
+                       hmv->magic = LNET_PROTO_MAGIC;
+       }
 
         hdr->src_nid        = cpu_to_le64 (hello->kshm_src_nid);
         hdr->src_pid        = cpu_to_le32 (hello->kshm_src_pid);
@@ -532,15 +526,11 @@ ksocknal_send_hello_v2(struct ksock_conn *conn, struct ksock_hello_msg *hello)
         hello->kshm_magic   = LNET_PROTO_MAGIC;
         hello->kshm_version = conn->ksnc_proto->pro_version;
 
-        if (the_lnet.ln_testprotocompat != 0) {
-                /* single-shot proto check */
-                LNET_LOCK();
-                if ((the_lnet.ln_testprotocompat & 1) != 0) {
-                        hello->kshm_version++;   /* just different! */
-                        the_lnet.ln_testprotocompat &= ~1;
-                }
-                LNET_UNLOCK();
-        }
+       if (the_lnet.ln_testprotocompat) {
+               /* single-shot proto check */
+               if (test_and_clear_bit(0, &the_lnet.ln_testprotocompat))
+                       hello->kshm_version++;   /* just different! */
+       }
 
        rc = lnet_sock_write(sock, hello, offsetof(struct ksock_hello_msg, kshm_ips),
                                lnet_acceptor_timeout());