drbd: drbd_send_protocol(): 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_main.c b/drivers/block/drbd/drbd_main.c
index 8d5ed6f5241634401ff002bb30fdfa44b6fc4857..29b993b9b8d750d2029ca56e8d83143cc7850b3d 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -825,7 +825,7 @@ int drbd_send_sync_param(struct drbd_conf *mdev)
 int drbd_send_protocol(struct drbd_tconn *tconn)
 {
        struct p_protocol *p;
-       int size, cf, rv;
+       int size, cf, err;
 
        size = sizeof(struct p_protocol);
 
@@ -836,7 +836,7 @@ int drbd_send_protocol(struct drbd_tconn *tconn)
         * as that is blocked during handshake */
        p = kmalloc(size, GFP_NOIO);
        if (p == NULL)
-               return 0;
+               return -ENOMEM;
 
        p->protocol      = cpu_to_be32(tconn->net_conf->wire_protocol);
        p->after_sb_0p   = cpu_to_be32(tconn->net_conf->after_sb_0p);
@@ -853,7 +853,7 @@ int drbd_send_protocol(struct drbd_tconn *tconn)
                else {
                        conn_err(tconn, "--dry-run is not supported by peer");
                        kfree(p);
-                       return -1;
+                       return -EOPNOTSUPP;
                }
        }
        p->conn_flags    = cpu_to_be32(cf);
@@ -861,9 +861,9 @@ int drbd_send_protocol(struct drbd_tconn *tconn)
        if (tconn->agreed_pro_version >= 87)
                strcpy(p->integrity_alg, tconn->net_conf->integrity_alg);
 
-       rv = !conn_send_cmd2(tconn, P_PROTOCOL, p->head.payload, size - sizeof(struct p_header));
+       err = conn_send_cmd2(tconn, P_PROTOCOL, p->head.payload, size - sizeof(struct p_header));
        kfree(p);
-       return rv;
+       return err;
 }
 
 int _drbd_send_uuids(struct drbd_conf *mdev, u64 uuid_flags)

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 470c7ed32582df2b3a6a08858fecb1800286ebff..222fca535e930902a8571ae8ed67fc422725a907 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -931,7 +931,7 @@ retry:
 
        drbd_thread_start(&tconn->asender);
 
-       if (drbd_send_protocol(tconn) == -1)
+       if (drbd_send_protocol(tconn) == -EOPNOTSUPP)
                return -1;
 
        return !idr_for_each(&tconn->volumes, drbd_connected, tconn);