drbd: Change how the initial packets are called
The first packets exchanged when a connection is established are
referred to as P_HAND_SHAKE_S and P_HAND_SHAKE_M in the code, followed
by P_HAND_SHAKE packets. To avoid confusion between these two unrelated
things, call the initial packets P_INITIAL_DATA and P_INITIAL_META.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 40cecd6..a5bf2b5 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -833,10 +833,10 @@
if (s) {
if (!tconn->data.socket) {
tconn->data.socket = s;
- drbd_send_fp(tconn, &tconn->data, P_HAND_SHAKE_S);
+ drbd_send_fp(tconn, &tconn->data, P_INITIAL_DATA);
} else if (!tconn->meta.socket) {
tconn->meta.socket = s;
- drbd_send_fp(tconn, &tconn->meta, P_HAND_SHAKE_M);
+ drbd_send_fp(tconn, &tconn->meta, P_INITIAL_META);
} else {
conn_err(tconn, "Logic error in drbd_connect()\n");
goto out_release_sockets;
@@ -858,14 +858,14 @@
drbd_socket_okay(&tconn->data.socket);
drbd_socket_okay(&tconn->meta.socket);
switch (try) {
- case P_HAND_SHAKE_S:
+ case P_INITIAL_DATA:
if (tconn->data.socket) {
conn_warn(tconn, "initial packet S crossed\n");
sock_release(tconn->data.socket);
}
tconn->data.socket = s;
break;
- case P_HAND_SHAKE_M:
+ case P_INITIAL_META:
if (tconn->meta.socket) {
conn_warn(tconn, "initial packet M crossed\n");
sock_release(tconn->meta.socket);