drbd: conn_send_state_req(): Return 0 upon success and an error code otherwise

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index aa426185fe998a754f40d8f1062d281f23193fac..1cc8dd759f11227cba615b685118758f77a8180f 100644 (file)
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -1962,7 +1962,7 @@ 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_state.c b/drivers/block/drbd/drbd_state.c
index 29372dbad2782764de5a270a9c2edf78e1c9daea..a33dda1e7bc34b954dc791ffa4c17817b5587204 100644 (file)
--- a/drivers/block/drbd/drbd_state.c
+++ b/drivers/block/drbd/drbd_state.c
@@ -1438,7 +1438,7 @@ conn_cl_wide(struct drbd_tconn *tconn, union drbd_state mask, union drbd_state v
        spin_unlock_irq(&tconn->req_lock);
        mutex_lock(&tconn->cstate_mutex);
 
-       if (!conn_send_state_req(tconn, mask, val)) {
+       if (conn_send_state_req(tconn, mask, val)) {
                rv = SS_CW_FAILED_BY_PEER;
                /* if (f & CS_VERBOSE)
                   print_st_err(mdev, os, ns, rv); */