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_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:
Andreas Gruenbacher 2011-03-16 01:12:50 +01:00 committed by Philipp Reisner
parent 9c1b7f7282
commit f02d4d0a9c
2 changed files with 2 additions and 4 deletions
drivers/block/drbd
drbd_main.cdrbd_receiver.c

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

@ -938,7 +938,6 @@ int drbd_send_sizes(struct drbd_conf *mdev, int trigger_reply, enum dds_flags fl
struct p_sizes p; struct p_sizes p;
sector_t d_size, u_size; sector_t d_size, u_size;
int q_order_type, max_bio_size; int q_order_type, max_bio_size;
int ok;
if (get_ldev_if_state(mdev, D_NEGOTIATING)) { if (get_ldev_if_state(mdev, D_NEGOTIATING)) {
D_ASSERT(mdev->ldev->backing_bdev); 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.queue_order_type = cpu_to_be16(q_order_type);
p.dds_flags = cpu_to_be16(flags); p.dds_flags = cpu_to_be16(flags);
ok = !drbd_send_cmd(mdev, &mdev->tconn->data, P_SIZES, &p.head, sizeof(p)); return drbd_send_cmd(mdev, &mdev->tconn->data, P_SIZES, &p.head, sizeof(p));
return ok;
} }
/** /**

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

@ -764,7 +764,7 @@ int drbd_connected(int vnr, void *p, void *data)
&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);
clear_bit(USE_DEGR_WFC_T, &mdev->flags); clear_bit(USE_DEGR_WFC_T, &mdev->flags);