Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-9679 various: use list_splice and list_splice_init
[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
c5cc07b
..
14bdb45
100644
(file)
--- a/
lnet/klnds/socklnd/socklnd_proto.c
+++ b/
lnet/klnds/socklnd/socklnd_proto.c
@@
-146,11
+146,10
@@
ksocknal_queue_tx_msg_v2(struct ksock_conn *conn, struct ksock_tx *tx_msg)
tx_msg->tx_msg.ksm_zc_cookies[1] = tx->tx_msg.ksm_zc_cookies[1];
ksocknal_next_tx_carrier(conn);
tx_msg->tx_msg.ksm_zc_cookies[1] = tx->tx_msg.ksm_zc_cookies[1];
ksocknal_next_tx_carrier(conn);
- /* use new_tx to replace the noop zc-ack packet */
- list_add(&tx_msg->tx_list, &tx->tx_list);
- list_del(&tx->tx_list);
+ /* use new_tx to replace the noop zc-ack packet */
+ list_splice(&tx->tx_list, &tx_msg->tx_list);
-
return tx;
+ return tx;
}
static int
}
static int
@@
-748,7
+747,7
@@
ksocknal_unpack_msg_v2(struct ksock_msg *msg)
return; /* Do nothing */
}
return; /* Do nothing */
}
-
struct ksock_proto
ksocknal_protocol_v1x =
+
const struct ksock_proto
ksocknal_protocol_v1x =
{
.pro_version = KSOCK_PROTO_V1,
.pro_send_hello = ksocknal_send_hello_v1,
{
.pro_version = KSOCK_PROTO_V1,
.pro_send_hello = ksocknal_send_hello_v1,
@@
-762,7
+761,7
@@
struct ksock_proto ksocknal_protocol_v1x =
.pro_match_tx = ksocknal_match_tx
};
.pro_match_tx = ksocknal_match_tx
};
-
struct ksock_proto
ksocknal_protocol_v2x =
+
const struct ksock_proto
ksocknal_protocol_v2x =
{
.pro_version = KSOCK_PROTO_V2,
.pro_send_hello = ksocknal_send_hello_v2,
{
.pro_version = KSOCK_PROTO_V2,
.pro_send_hello = ksocknal_send_hello_v2,
@@
-776,7
+775,7
@@
struct ksock_proto ksocknal_protocol_v2x =
.pro_match_tx = ksocknal_match_tx
};
.pro_match_tx = ksocknal_match_tx
};
-
struct ksock_proto
ksocknal_protocol_v3x =
+
const struct ksock_proto
ksocknal_protocol_v3x =
{
.pro_version = KSOCK_PROTO_V3,
.pro_send_hello = ksocknal_send_hello_v2,
{
.pro_version = KSOCK_PROTO_V3,
.pro_send_hello = ksocknal_send_hello_v2,