diff options
| author | Andreas Gruenbacher | 2011-03-16 01:05:37 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:44:34 +0100 |
| commit | 387eb30817f9009467a90cdbb3ab4dd0dc02a92f (patch) | |
| tree | 78fc95be39463080d538cbe56b784ee3ecf0c942 /drivers/block/drbd/drbd_main.c | |
| parent | drbd: drbd_send_handshake(): Return 0 upon success and an error code otherwise (diff) | |
| download | kernel-qcow2-linux-387eb30817f9009467a90cdbb3ab4dd0dc02a92f.tar.gz kernel-qcow2-linux-387eb30817f9009467a90cdbb3ab4dd0dc02a92f.tar.xz kernel-qcow2-linux-387eb30817f9009467a90cdbb3ab4dd0dc02a92f.zip | |
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>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 8d5ed6f52416..29b993b9b8d7 100644 --- 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) |