From bb1f6999a271a84abe5c9c7aba7b603b35de23b7 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Wed, 16 Mar 2011 10:55:07 +0100 Subject: [PATCH] --- yaml --- r: 345875 b: refs/heads/master c: dfafcc8a7ba120492ae2a27b6ec774aa3224903b h: refs/heads/master i: 345873: a16adf28b8f9915f0bea5a12c61870cd2cdcb724 345871: 5988e876aba0a6b696fab7cc6e1e006abc9b0438 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 36 ++++++++++++++++++------ 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index ef8c9fb6edc8..ed37ce51dbac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7204624c5e88fdfd33a3badc7989148f6962b523 +refs/heads/master: dfafcc8a7ba120492ae2a27b6ec774aa3224903b diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 4a985d3b67c4..704cb7087879 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -3331,19 +3331,39 @@ static int receive_req_state(struct drbd_conf *mdev, enum drbd_packet cmd, mask = convert_state(mask); val = convert_state(val); - if (cmd == P_CONN_ST_CHG_REQ) { - rv = conn_request_state(mdev->tconn, mask, val, CS_VERBOSE | CS_LOCAL_ONLY); - conn_send_sr_reply(mdev->tconn, rv); - } else { - rv = drbd_change_state(mdev, CS_VERBOSE, mask, val); - drbd_send_sr_reply(mdev, rv); - } + rv = drbd_change_state(mdev, CS_VERBOSE, mask, val); + drbd_send_sr_reply(mdev, rv); drbd_md_sync(mdev); return true; } +static int receive_req_conn_state(struct drbd_tconn *tconn, enum drbd_packet cmd, + unsigned int data_size) +{ + struct p_req_state *p = &tconn->data.rbuf.req_state; + union drbd_state mask, val; + enum drbd_state_rv rv; + + mask.i = be32_to_cpu(p->mask); + val.i = be32_to_cpu(p->val); + + if (test_bit(DISCARD_CONCURRENT, &tconn->flags) && + mutex_is_locked(&tconn->cstate_mutex)) { + conn_send_sr_reply(tconn, SS_CONCURRENT_ST_CHG); + return true; + } + + mask = convert_state(mask); + val = convert_state(val); + + rv = conn_request_state(tconn, mask, val, CS_VERBOSE | CS_LOCAL_ONLY); + conn_send_sr_reply(tconn, rv); + + return true; +} + static int receive_state(struct drbd_conf *mdev, enum drbd_packet cmd, unsigned int data_size) { @@ -3891,7 +3911,7 @@ static struct data_cmd drbd_cmd_handler[] = { [P_CSUM_RS_REQUEST] = { 1, sizeof(struct p_block_req), MDEV, { receive_DataRequest } }, [P_DELAY_PROBE] = { 0, sizeof(struct p_delay_probe93), MDEV, { receive_skip } }, [P_OUT_OF_SYNC] = { 0, sizeof(struct p_block_desc), MDEV, { receive_out_of_sync } }, - [P_CONN_ST_CHG_REQ] = { 0, sizeof(struct p_req_state), MDEV, { receive_req_state } }, + [P_CONN_ST_CHG_REQ] = { 0, sizeof(struct p_req_state), CONN, { .conn_fn = receive_req_conn_state } }, }; /* All handler functions that expect a sub-header get that sub-heder in