mirror of https://gitee.com/openkylin/linux.git
drbd: drbd_send_sizes(): 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:
parent
9c1b7f7282
commit
f02d4d0a9c
drivers/block/drbd
|
@ -938,7 +938,6 @@ int drbd_send_sizes(struct drbd_conf *mdev, int trigger_reply, enum dds_flags fl
|
|||
struct p_sizes p;
|
||||
sector_t d_size, u_size;
|
||||
int q_order_type, max_bio_size;
|
||||
int ok;
|
||||
|
||||
if (get_ldev_if_state(mdev, D_NEGOTIATING)) {
|
||||
D_ASSERT(mdev->ldev->backing_bdev);
|
||||
|
@ -962,8 +961,7 @@ int drbd_send_sizes(struct drbd_conf *mdev, int trigger_reply, enum dds_flags fl
|
|||
p.queue_order_type = cpu_to_be16(q_order_type);
|
||||
p.dds_flags = cpu_to_be16(flags);
|
||||
|
||||
ok = !drbd_send_cmd(mdev, &mdev->tconn->data, P_SIZES, &p.head, sizeof(p));
|
||||
return ok;
|
||||
return drbd_send_cmd(mdev, &mdev->tconn->data, P_SIZES, &p.head, sizeof(p));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -764,7 +764,7 @@ int drbd_connected(int vnr, void *p, void *data)
|
|||
&mdev->own_state_mutex;
|
||||
|
||||
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_state(mdev);
|
||||
clear_bit(USE_DEGR_WFC_T, &mdev->flags);
|
||||
|
|
Loading…
Reference in New Issue