lkml.org 
[lkml]   [2011]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 116/118] drbd: Implemented receiving of P_CONN_ST_CHG_REPLY
    Date
    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
    ---
    drivers/block/drbd/drbd_int.h | 2 ++
    drivers/block/drbd/drbd_receiver.c | 28 ++++++++++++++++++++--------
    2 files changed, 22 insertions(+), 8 deletions(-)

    diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
    index 4fc1b0db..ed3d498 100644
    --- a/drivers/block/drbd/drbd_int.h
    +++ b/drivers/block/drbd/drbd_int.h
    @@ -913,6 +913,8 @@ enum {
    SEND_PING, /* whether asender should send a ping asap */
    SIGNAL_ASENDER, /* whether asender wants to be interrupted */
    GOT_PING_ACK, /* set when we receive a ping_ack packet, ping_wait gets woken */
    + CONN_WD_ST_CHG_OKAY,
    + CONN_WD_ST_CHG_FAIL,
    };

    struct drbd_tconn { /* is a resource from the config file */
    diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
    index 86d1e9b..bdd3f00 100644
    --- a/drivers/block/drbd/drbd_receiver.c
    +++ b/drivers/block/drbd/drbd_receiver.c
    @@ -4268,18 +4268,29 @@ int drbdd_init(struct drbd_thread *thi)
    static int got_RqSReply(struct drbd_conf *mdev, enum drbd_packet cmd)
    {
    struct p_req_state_reply *p = &mdev->tconn->meta.rbuf.req_state_reply;
    + struct drbd_tconn *tconn = mdev->tconn;

    int retcode = be32_to_cpu(p->retcode);

    - if (retcode >= SS_SUCCESS) {
    - set_bit(CL_ST_CHG_SUCCESS, &mdev->flags);
    - } else {
    - set_bit(CL_ST_CHG_FAIL, &mdev->flags);
    - dev_err(DEV, "Requested state change failed by peer: %s (%d)\n",
    - drbd_set_st_err_str(retcode), retcode);
    + if (cmd == P_STATE_CHG_REPLY) {
    + if (retcode >= SS_SUCCESS) {
    + set_bit(CL_ST_CHG_SUCCESS, &mdev->flags);
    + } else {
    + set_bit(CL_ST_CHG_FAIL, &mdev->flags);
    + dev_err(DEV, "Requested state change failed by peer: %s (%d)\n",
    + drbd_set_st_err_str(retcode), retcode);
    + }
    + wake_up(&mdev->state_wait);
    + } else /* conn == P_CONN_ST_CHG_REPLY */ {
    + if (retcode >= SS_SUCCESS) {
    + set_bit(CONN_WD_ST_CHG_OKAY, &tconn->flags);
    + } else {
    + set_bit(CONN_WD_ST_CHG_FAIL, &tconn->flags);
    + conn_err(tconn, "Requested state change failed by peer: %s (%d)\n",
    + drbd_set_st_err_str(retcode), retcode);
    + }
    + wake_up(&tconn->ping_wait);
    }
    - wake_up(&mdev->state_wait);
    -
    return true;
    }

    @@ -4556,6 +4567,7 @@ static struct asender_cmd *get_asender_cmd(int cmd)
    [P_RS_IS_IN_SYNC] = { sizeof(struct p_block_ack), got_IsInSync },
    [P_DELAY_PROBE] = { sizeof(struct p_delay_probe93), got_skip },
    [P_RS_CANCEL] = { sizeof(struct p_block_ack), got_NegRSDReply},
    + [P_CONN_ST_CHG_REPLY]={ sizeof(struct p_req_state_reply), got_RqSReply },
    [P_MAX_CMD] = { 0, NULL },
    };
    if (cmd > P_MAX_CMD || asender_tbl[cmd].process == NULL)
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-08-25 17:15    [W:2.436 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site