diff options
| author | Philipp Reisner | 2011-03-16 10:55:07 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-04 00:16:28 +0100 |
| commit | dfafcc8a7ba120492ae2a27b6ec774aa3224903b (patch) | |
| tree | 14279cd3e48cfe2a8cbfcd2c317e717017541c40 /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: Converted receive_protocol() from mdev to tconn (diff) | |
| download | kernel-qcow2-linux-dfafcc8a7ba120492ae2a27b6ec774aa3224903b.tar.gz kernel-qcow2-linux-dfafcc8a7ba120492ae2a27b6ec774aa3224903b.tar.xz kernel-qcow2-linux-dfafcc8a7ba120492ae2a27b6ec774aa3224903b.zip | |
drbd: Separate connection state changes from minor dev state changes #1
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_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 4a985d3b67c4..704cb7087879 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/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 |