drbd: _conn_send_cmd(): 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 0bd8c2a800c2c84f0b62cfd833ecaeec841576e9..1f17d837db4c903ae2149c191825f23edc564208 100644 (file)
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -1926,7 +1926,7 @@ static inline int _drbd_send_cmd(struct drbd_conf *mdev, struct socket *sock,
                                  enum drbd_packet cmd, struct p_header *h, size_t size,
                                  unsigned msg_flags)
 {
-       return _conn_send_cmd(mdev->tconn, mdev->vnr, sock, cmd, h, size, msg_flags);
+       return !_conn_send_cmd(mdev->tconn, mdev->vnr, sock, cmd, h, size, msg_flags);
 }
 
 static inline int drbd_send_cmd(struct drbd_conf *mdev, int use_data_socket,

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 018c336aea09dd52495cb7f20e5d074e169e3130..ff0085b98bee0b69aec6033ea0a02a1462adeb2f 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -723,17 +723,14 @@ int _conn_send_cmd(struct drbd_tconn *tconn, int vnr, struct socket *sock,
                   enum drbd_packet cmd, struct p_header *h, size_t size,
                   unsigned msg_flags)
 {
-       int sent, ok;
+       int err;
 
        _prepare_header(tconn, vnr, h, cmd, size - sizeof(struct p_header));
-
-       sent = drbd_send(tconn, sock, h, size, msg_flags);
-
-       ok = (sent == size);
-       if (!ok && !signal_pending(current))
-               conn_warn(tconn, "short sent %s size=%d sent=%d\n",
-                         cmdname(cmd), (int)size, sent);
-       return ok;
+       err = drbd_send_all(tconn, sock, h, size, msg_flags);
+       if (err && !signal_pending(current))
+               conn_warn(tconn, "short send %s size=%d\n",
+                         cmdname(cmd), (int)size);
+       return err;
 }
 
 /* don't pass the socket. we may only look at it
@@ -756,7 +753,7 @@ int conn_send_cmd(struct drbd_tconn *tconn, int vnr, int use_data_socket,
        /* drbd_disconnect() could have called drbd_free_sock()
         * while we were waiting in down()... */
        if (likely(sock != NULL))
-               ok = _conn_send_cmd(tconn, vnr, sock, cmd, h, size, 0);
+               ok = !_conn_send_cmd(tconn, vnr, sock, cmd, h, size, 0);
 
        if (use_data_socket)
                mutex_unlock(&tconn->data.mutex);

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 9c781ff1aa8b425eb50fb03c90cd7a6176b711b9..d21c2ffe6c6f7796e4ff030ae897af0a5fee8672 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -711,7 +711,7 @@ static int drbd_send_fp(struct drbd_tconn *tconn, struct socket *sock, enum drbd
 {
        struct p_header *h = &tconn->data.sbuf.header;
 
-       return _conn_send_cmd(tconn, 0, sock, cmd, h, sizeof(*h), 0);
+       return !_conn_send_cmd(tconn, 0, sock, cmd, h, sizeof(*h), 0);
 }
 
 static enum drbd_packet drbd_recv_fp(struct drbd_tconn *tconn, struct socket *sock)
@@ -4150,8 +4150,8 @@ static int drbd_send_handshake(struct drbd_tconn *tconn)
        memset(p, 0, sizeof(*p));
        p->protocol_min = cpu_to_be32(PRO_VERSION_MIN);
        p->protocol_max = cpu_to_be32(PRO_VERSION_MAX);
-       ok = _conn_send_cmd(tconn, 0, tconn->data.socket, P_HAND_SHAKE,
-                           &p->head, sizeof(*p), 0);
+       ok = !_conn_send_cmd(tconn, 0, tconn->data.socket, P_HAND_SHAKE,
+                            &p->head, sizeof(*p), 0);
        mutex_unlock(&tconn->data.mutex);
        return ok;
 }