Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcb20d1a authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: Refuse to change network options online when... 



* the peer does not speak protocol_version 100 and the
  user wants to change one of:
    - wire_protocol
    - two_primaries
    - integrity_alg

* the user wants to remove the allow_two_primaries flag
  when there are two primaries

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent c5482bbd

drivers/block/drbd/drbd_nl.c

+18 −4
Original line number Diff line number Diff line
@@ -1722,11 +1722,25 @@ _check_net_options(struct drbd_tconn *tconn, struct net_conf *old_conf, struct n 
	struct drbd_conf *mdev;

	int i;



	if (old_conf && tconn->agreed_pro_version < 100 &&

	    tconn->cstate == C_WF_REPORT_PARAMS &&

	    new_conf->wire_protocol != old_conf->wire_protocol)

	if (old_conf && tconn->cstate == C_WF_REPORT_PARAMS && tconn->agreed_pro_version < 100) {

		if (new_conf->wire_protocol != old_conf->wire_protocol)

			return ERR_NEED_APV_100;



		if (new_conf->two_primaries != old_conf->two_primaries)

			return ERR_NEED_APV_100;



		if (!new_conf->integrity_alg != !old_conf->integrity_alg)

			return ERR_NEED_APV_100;



		if (strcmp(new_conf->integrity_alg, old_conf->integrity_alg))

			return ERR_NEED_APV_100;

	}



	if (!new_conf->two_primaries &&

	    conn_highest_role(tconn) == R_PRIMARY &&

	    conn_highest_peer(tconn) == R_PRIMARY)

		return ERR_NEED_ALLOW_TWO_PRI;



	if (new_conf->two_primaries &&

	    (new_conf->wire_protocol != DRBD_PROT_C))

		return ERR_NOT_PROTO_C;

include/linux/drbd.h

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ enum drbd_ret_code { 
	ERR_MINOR_EXISTS	= 161,

	ERR_INVALID_REQUEST	= 162,

	ERR_NEED_APV_100	= 163,

	ERR_NEED_ALLOW_TWO_PRI  = 164,



	/* insert new ones above this line */

	AFTER_LAST_ERR_CODE