From 72d67be2124368117f505ed0c4ce73fcf66f78c9 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Wed, 16 Mar 2011 01:12:50 +0100 Subject: [PATCH] --- yaml --- r: 345899 b: refs/heads/master c: f02d4d0a9c3d3b8aef5a3b1016a3f69b0ae9496e h: refs/heads/master i: 345897: e4326f6cf4ac1215cb704627cf9deb00f3880238 345895: 7d11e366a232821dddff12c88cc04457fc8c9ec2 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 4 +--- trunk/drivers/block/drbd/drbd_receiver.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7c02d5cd9d56..fef5634dec45 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c1b7f7282d9f6a8623706c0c361652105f3e7ad +refs/heads/master: f02d4d0a9c3d3b8aef5a3b1016a3f69b0ae9496e diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index 7ed2e2ebb895..8e3607a2ae0d 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -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)); } /** diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 1403e4b18a28..30a9559918a0 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -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);