lkml.org 
[lkml]   [2011]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/54] drbd: _conn_send_state_req(): Return 0 upon success and an error code otherwise
    Date
    From: Andreas Gruenbacher <agruen@linbit.com>

    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
    ---
    drivers/block/drbd/drbd_int.h | 4 ++--
    drivers/block/drbd/drbd_main.c | 2 +-
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
    index a375133..bf2eb2e 100644
    --- a/drivers/block/drbd/drbd_int.h
    +++ b/drivers/block/drbd/drbd_int.h
    @@ -1955,14 +1955,14 @@ static inline int drbd_send_ping_ack(struct drbd_tconn *tconn)
    static inline int drbd_send_state_req(struct drbd_conf *mdev,
    union drbd_state mask, union drbd_state val)
    {
    - return _conn_send_state_req(mdev->tconn, mdev->vnr, P_STATE_CHG_REQ, mask, val);
    + return !_conn_send_state_req(mdev->tconn, mdev->vnr, P_STATE_CHG_REQ, mask, val);
    }

    static inline int conn_send_state_req(struct drbd_tconn *tconn,
    union drbd_state mask, union drbd_state val)
    {
    enum drbd_packet cmd = tconn->agreed_pro_version < 100 ? P_STATE_CHG_REQ : P_CONN_ST_CHG_REQ;
    - return _conn_send_state_req(tconn, 0, cmd, mask, val);
    + return !_conn_send_state_req(tconn, 0, cmd, mask, val);
    }

    static inline void drbd_thread_stop(struct drbd_thread *thi)
    diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
    index e3b54ce..93713da 100644
    --- a/drivers/block/drbd/drbd_main.c
    +++ b/drivers/block/drbd/drbd_main.c
    @@ -995,7 +995,7 @@ int _conn_send_state_req(struct drbd_tconn *tconn, int vnr, enum drbd_packet cmd
    p.mask = cpu_to_be32(mask.i);
    p.val = cpu_to_be32(val.i);

    - return !conn_send_cmd(tconn, vnr, &tconn->data, cmd, &p.head, sizeof(p));
    + return conn_send_cmd(tconn, vnr, &tconn->data, cmd, &p.head, sizeof(p));
    }

    int drbd_send_sr_reply(struct drbd_conf *mdev, enum drbd_state_rv retcode)
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-09-05 14:05    [W:0.023 / U:0.024 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site