UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drbd: drbd_send_sync_param(): 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>
This commit is contained in:
Andreas Gruenbacher 2011-03-16 00:43:02 +01:00 committed by Philipp Reisner
parent f725446353
commit 103ea27528
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/block/drbd/drbd_main.c
View File

@ -769,7 +769,7 @@ int drbd_send_sync_param(struct drbd_conf *mdev)
{ {
struct p_rs_param_95 *p; struct p_rs_param_95 *p;
struct socket *sock; struct socket *sock;
int size, rv; int size, err;
const int apv = mdev->tconn->agreed_pro_version; const int apv = mdev->tconn->agreed_pro_version;
size = apv <= 87 ? sizeof(struct p_rs_param) size = apv <= 87 ? sizeof(struct p_rs_param)
@ -813,13 +813,13 @@ int drbd_send_sync_param(struct drbd_conf *mdev)
if (apv >= 89) if (apv >= 89)
strcpy(p->csums_alg, mdev->tconn->net_conf->csums_alg); strcpy(p->csums_alg, mdev->tconn->net_conf->csums_alg);
rv = !_drbd_send_cmd(mdev, sock, cmd, &p->head, size, 0); err = _drbd_send_cmd(mdev, sock, cmd, &p->head, size, 0);
} else } else
rv = 0; /* not ok */ err = -EIO;
mutex_unlock(&mdev->tconn->data.mutex); mutex_unlock(&mdev->tconn->data.mutex);
return rv; return err;
} }
int drbd_send_protocol(struct drbd_tconn *tconn) int drbd_send_protocol(struct drbd_tconn *tconn)

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

@ -763,7 +763,7 @@ int drbd_connected(int vnr, void *p, void *data)
&mdev->tconn->cstate_mutex : &mdev->tconn->cstate_mutex :
&mdev->own_state_mutex; &mdev->own_state_mutex;
ok &= drbd_send_sync_param(mdev); ok &= !drbd_send_sync_param(mdev);
ok &= drbd_send_sizes(mdev, 0, 0); ok &= drbd_send_sizes(mdev, 0, 0);
ok &= drbd_send_uuids(mdev); ok &= drbd_send_uuids(mdev);
ok &= drbd_send_state(mdev); ok &= drbd_send_state(mdev);