redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Andreas Gruenbacher 2011-03-16 01:05:37 +01:00 committed by Philipp Reisner
parent e8d17b015e
commit 387eb30817
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/block/drbd/drbd_main.c
View file

@ -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)

2
drivers/block/drbd/drbd_receiver.c
View file

@ -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);