forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drbd: Allow online change of replication protocol only with agreed_pv >= 100

Browse source 
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Philipp Reisner 2011-04-13 18:16:10 -07:00
commit b032b6fa35
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/block/drbd/drbd_nl.c
View file

@ -1671,6 +1671,11 @@ check_net_options(struct drbd_tconn *tconn, struct net_conf *new_conf)
struct drbd_conf *mdev; struct drbd_conf *mdev;
int i; int i;
if (tconn->net_conf && tconn->agreed_pro_version < 100 &&
tconn->cstate == C_WF_REPORT_PARAMS &&
new_conf->wire_protocol != tconn->net_conf->wire_protocol)
return ERR_NEED_APV_100;
if (new_conf->two_primaries && if (new_conf->two_primaries &&
(new_conf->wire_protocol != DRBD_PROT_C)) (new_conf->wire_protocol != DRBD_PROT_C))
return ERR_NOT_PROTO_C; return ERR_NOT_PROTO_C;

1
include/linux/drbd.h
View file

@ -160,6 +160,7 @@ enum drbd_ret_code {
ERR_MINOR_CONFIGURED = 160, ERR_MINOR_CONFIGURED = 160,
ERR_MINOR_EXISTS = 161, ERR_MINOR_EXISTS = 161,
ERR_INVALID_REQUEST = 162, ERR_INVALID_REQUEST = 162,
ERR_NEED_APV_100 = 163,
/* insert new ones above this line */ /* insert new ones above this line */
AFTER_LAST_ERR_CODE AFTER_LAST_ERR_CODE