diff options
author | Andreas Gruenbacher | 2011-03-28 17:05:50 +0200 |
---|---|---|
committer | Philipp Reisner | 2012-11-08 16:45:00 +0100 |
commit | 6038178ebe29e6b5e4d519a5ac56653d156c90f9 (patch) | |
tree | f17de8ae7eeb6af23b28bc096ebecea45f08531a /drivers/block/drbd/drbd_main.c | |
parent | drbd: Change how the initial packets are called (diff) | |
download | kernel-qcow2-linux-6038178ebe29e6b5e4d519a5ac56653d156c90f9.tar.gz kernel-qcow2-linux-6038178ebe29e6b5e4d519a5ac56653d156c90f9.tar.xz kernel-qcow2-linux-6038178ebe29e6b5e4d519a5ac56653d156c90f9.zip |
drbd: Change how the "handshake" packets are called
Packets of type P_HAND_SHAKE define which protocol versions and features
a node supports. For clarity, call those packets P_CONNECTION_FEATURES
instead.
(This does not determine the features that a specific drbd device
supports, such as drbd protocol A, B, C.)
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
-rw-r--r-- | drivers/block/drbd/drbd_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index a991d1c589fe..71e3470304dd 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -2497,7 +2497,7 @@ int __init drbd_init(void) int err; BUILD_BUG_ON(sizeof(struct p_header80) != sizeof(struct p_header95)); - BUILD_BUG_ON(sizeof(struct p_handshake) != 80); + BUILD_BUG_ON(sizeof(struct p_connection_features) != 80); if (minor_count < DRBD_MINOR_COUNT_MIN || minor_count > DRBD_MINOR_COUNT_MAX) { printk(KERN_ERR @@ -3149,8 +3149,8 @@ const char *cmdname(enum drbd_packet cmd) return "InitialMeta"; if (cmd == P_INITIAL_DATA) return "InitialData"; - if (cmd == P_HAND_SHAKE) - return "HandShake"; + if (cmd == P_CONNECTION_FEATURES) + return "ConnectionFeatures"; if (cmd >= ARRAY_SIZE(cmdnames)) return "Unknown"; return cmdnames[cmd]; |