iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drbd: Send PROTOCOL_UPDATE packets when appropriate

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-05-16 17:38:45 +02:00
parent 036b17eaab
commit d659f2aaea
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/block/drbd/drbd_int.h
View File

@ -1051,7 +1051,7 @@ extern int drbd_send(struct drbd_tconn *tconn, struct socket *sock,
extern int drbd_send_all(struct drbd_tconn *, struct socket *, void *, size_t, extern int drbd_send_all(struct drbd_tconn *, struct socket *, void *, size_t,
unsigned); unsigned);
extern int __drbd_send_protocol(struct drbd_tconn *tconn); extern int __drbd_send_protocol(struct drbd_tconn *tconn, enum drbd_packet cmd);
extern int drbd_send_protocol(struct drbd_tconn *tconn); extern int drbd_send_protocol(struct drbd_tconn *tconn);
extern int drbd_send_uuids(struct drbd_conf *mdev); extern int drbd_send_uuids(struct drbd_conf *mdev);
extern int drbd_send_uuids_skip_initial_sync(struct drbd_conf *mdev); extern int drbd_send_uuids_skip_initial_sync(struct drbd_conf *mdev);

6
drivers/block/drbd/drbd_main.c
View File

@ -911,7 +911,7 @@ int drbd_send_sync_param(struct drbd_conf *mdev)
return drbd_send_command(mdev, sock, cmd, size, NULL, 0); return drbd_send_command(mdev, sock, cmd, size, NULL, 0);
} }
int __drbd_send_protocol(struct drbd_tconn *tconn) int __drbd_send_protocol(struct drbd_tconn *tconn, enum drbd_packet cmd)
{ {
struct drbd_socket *sock; struct drbd_socket *sock;
struct p_protocol *p; struct p_protocol *p;
@ -953,7 +953,7 @@ int __drbd_send_protocol(struct drbd_tconn *tconn)
strcpy(p->integrity_alg, nc->integrity_alg); strcpy(p->integrity_alg, nc->integrity_alg);
rcu_read_unlock(); rcu_read_unlock();
return __conn_send_command(tconn, sock, P_PROTOCOL, size, NULL, 0); return __conn_send_command(tconn, sock, cmd, size, NULL, 0);
} }
int drbd_send_protocol(struct drbd_tconn *tconn) int drbd_send_protocol(struct drbd_tconn *tconn)
@ -961,7 +961,7 @@ int drbd_send_protocol(struct drbd_tconn *tconn)
int err; int err;
mutex_lock(&tconn->data.mutex); mutex_lock(&tconn->data.mutex);
err = __drbd_send_protocol(tconn); err = __drbd_send_protocol(tconn, P_PROTOCOL);
mutex_unlock(&tconn->data.mutex); mutex_unlock(&tconn->data.mutex);
return err; return err;

11
drivers/block/drbd/drbd_nl.c
View File

@ -1866,7 +1866,6 @@ int drbd_adm_net_opts(struct sk_buff *skb, struct genl_info *info)
int ovr; /* online verify running */ int ovr; /* online verify running */
int rsr; /* re-sync running */ int rsr; /* re-sync running */
struct crypto crypto = { }; struct crypto crypto = { };
bool change_integrity_alg;
retcode = drbd_adm_prepare(skb, info, DRBD_ADM_NEED_CONN); retcode = drbd_adm_prepare(skb, info, DRBD_ADM_NEED_CONN);
if (!adm_ctx.reply_skb) if (!adm_ctx.reply_skb)
@ -1923,9 +1922,6 @@ int drbd_adm_net_opts(struct sk_buff *skb, struct genl_info *info)
goto fail; goto fail;
} }
change_integrity_alg = strcmp(old_conf->integrity_alg,
new_conf->integrity_alg);
retcode = alloc_crypto(&crypto, new_conf); retcode = alloc_crypto(&crypto, new_conf);
if (retcode != NO_ERROR) if (retcode != NO_ERROR)
goto fail; goto fail;
@ -1949,13 +1945,10 @@ int drbd_adm_net_opts(struct sk_buff *skb, struct genl_info *info)
tconn->int_dig_vv = crypto.int_dig_vv; tconn->int_dig_vv = crypto.int_dig_vv;
crypto_free_hash(tconn->integrity_tfm); crypto_free_hash(tconn->integrity_tfm);
tconn->integrity_tfm = crypto.integrity_tfm; tconn->integrity_tfm = crypto.integrity_tfm;
if (change_integrity_alg) { if (tconn->cstate >= C_WF_REPORT_PARAMS && tconn->agreed_pro_version >= 100)
/* Do this without trying to take tconn->data.mutex again. */ /* Do this without trying to take tconn->data.mutex again. */
if (__drbd_send_protocol(tconn)) __drbd_send_protocol(tconn, P_PROTOCOL_UPDATE);
goto fail;
}
/* FIXME Changing cram_hmac while the connection is established is useless */
crypto_free_hash(tconn->cram_hmac_tfm); crypto_free_hash(tconn->cram_hmac_tfm);
tconn->cram_hmac_tfm = crypto.cram_hmac_tfm; tconn->cram_hmac_tfm = crypto.cram_hmac_tfm;