提交 2ae5f95b 编写于 作者: A Andreas Gruenbacher 提交者: Philipp Reisner

drbd: drbd_send_uuids() and its variants: Return 0 upon success and an error code otherwise

Signed-off-by: NPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: NLars Ellenberg <lars.ellenberg@linbit.com>
上级 387eb308
...@@ -872,7 +872,7 @@ int _drbd_send_uuids(struct drbd_conf *mdev, u64 uuid_flags) ...@@ -872,7 +872,7 @@ int _drbd_send_uuids(struct drbd_conf *mdev, u64 uuid_flags)
int i; int i;
if (!get_ldev_if_state(mdev, D_NEGOTIATING)) if (!get_ldev_if_state(mdev, D_NEGOTIATING))
return 1; return 0;
for (i = UI_CURRENT; i < UI_SIZE; i++) for (i = UI_CURRENT; i < UI_SIZE; i++)
p.uuid[i] = mdev->ldev ? cpu_to_be64(mdev->ldev->md.uuid[i]) : 0; p.uuid[i] = mdev->ldev ? cpu_to_be64(mdev->ldev->md.uuid[i]) : 0;
...@@ -886,7 +886,7 @@ int _drbd_send_uuids(struct drbd_conf *mdev, u64 uuid_flags) ...@@ -886,7 +886,7 @@ int _drbd_send_uuids(struct drbd_conf *mdev, u64 uuid_flags)
put_ldev(mdev); put_ldev(mdev);
return !drbd_send_cmd(mdev, &mdev->tconn->data, P_UUIDS, &p.head, sizeof(p)); return drbd_send_cmd(mdev, &mdev->tconn->data, P_UUIDS, &p.head, sizeof(p));
} }
int drbd_send_uuids(struct drbd_conf *mdev) int drbd_send_uuids(struct drbd_conf *mdev)
......
...@@ -765,7 +765,7 @@ int drbd_connected(int vnr, void *p, void *data) ...@@ -765,7 +765,7 @@ int drbd_connected(int vnr, void *p, void *data)
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);
clear_bit(USE_DEGR_WFC_T, &mdev->flags); clear_bit(USE_DEGR_WFC_T, &mdev->flags);
clear_bit(RESIZE_PENDING, &mdev->flags); clear_bit(RESIZE_PENDING, &mdev->flags);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册