From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755349AbcIJUbT (ORCPT ); Sat, 10 Sep 2016 16:31:19 -0400 Received: from mout.web.de ([212.227.17.12]:57861 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752572AbcIJUbQ (ORCPT ); Sat, 10 Sep 2016 16:31:16 -0400 Subject: [PATCH 08/13] DRBD-receiver: Move an assignment in receive_sizes() To: drbd-dev@lists.linbit.com, Lars Ellenberg , Philipp Reisner References: <3566e764-27b8-82e5-1f8e-c613e5a3a5b1@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <59238c49-0c8a-fa28-4a4b-2d3924968acb@users.sourceforge.net> Date: Sat, 10 Sep 2016 22:31:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <3566e764-27b8-82e5-1f8e-c613e5a3a5b1@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:GX8SjNAddYl8KaOYQ5yg2RQQnLLWXfJfd7ILp9uVR5JLBdegxjA cWUEprDDiHYmd6zSrOBkarHrOm4STnU6B2g5oi4bVePdqu49RVrlYWAuvi6aYW+Qf+8nZWX lyxim/2IJOP2248Wc5ZgYlwhXQwa9k7lnBVrQQ8fll2FaVa/Z+1UR0T3tswdD5Dx59Tz4Nd Ge2yGmDweo8hqJH59XJdw== X-UI-Out-Filterresults: notjunk:1;V01:K0:s/Ktx0vkQq8=:cVcMXgZDuD1zzncSTezSUS ziZoIJ6idslFRmerU4S9Cy0/T5wnJgGqZJ6q4t4w7RHrkBkSja+WsjpMUqRANiOHGWt7W7Gnf OeiXrLrTpGRFr1k7LEuaj//yonH9QQ2KV6tLPYIVH1FB7vlaynt41MvHSIHMSZZapDEMnSyQq 7+ev+X9EzH418ETgPubzp6O9xeVv2W0EGi41LfE7u6zUaGy7QwqT59ccvLVVCN9iXI4CDwZTr sCu+h2BPtK6lZSAU3JNO8sbAlpoF4y6c9SztbVUgsxTpGdYOJnqZ41poHwRzT9QwLn4hnbxBW kENZqk1bvMvPBiRK+IDuo4dY8plPu7eJZ5Bthv8hOqwRngX2T7cMqXy5ya3ODWcvlEpYIkxGt GVLHawj+OJOZ4GmJUayQLsPOvMsHPLQqlghQXDCrEAFttgaf5j9q+ocLolNnmgAtLtnHCigsH 1Lpwu9FzYbH97v5LRs4+BSv4/f37j2B+jsvz9mVk5LuJRvXHEyy/w+RDVBTstzsWaJP7uzb3q wd2RgutCqOXER0va0PtuMG+8dtWE0lJ5iSBumHOqHxkAphzqXr+jQF2PLumx2IwUTTUL7MIMX pxUSt1pgOwVZlRgjd7upElSJkbXnBRQ+UoaFP2mIh/t5SGjmD8H2EtAvMJQNoLw4oGeKK6e/n b8fEnxWqzNwCrddMdw8I8hR8eVokbArLxIeIrDopBBNyUslZ6cWo/8uWHXcP+chUjpupJaVs9 cuMXaArY1J9u7ADx1KzPZXTbCmHhHstZiHwjCpXwJ5ZI5fEayUUX7B3QwqJSsDYJzNDLQkLK+ XNT7/7W Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 10 Sep 2016 21:50:18 +0200 Move one assignment for the local variable "ldsc" so that its setting will only be performed after corresponding data processing succeeded by this function. Signed-off-by: Markus Elfring --- drivers/block/drbd/drbd_receiver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 6a9c16e..2fe58d1 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -4036,7 +4036,7 @@ static int receive_sizes(struct drbd_connection *connection, struct packet_info struct o_qlim *o = (connection->agreed_features & DRBD_FF_WSAME) ? p->qlim : NULL; enum determine_dev_size dd = DS_UNCHANGED; sector_t p_size, p_usize, p_csize, my_usize; - int ldsc = 0; /* local disk size changed */ + int ldsc; /* local disk size changed */ enum dds_flags ddsf; peer_device = conn_peer_device(connection, pi->vnr); @@ -4141,6 +4141,7 @@ static int receive_sizes(struct drbd_connection *connection, struct packet_info drbd_set_my_capacity(device, p_csize ?: p_usize ?: p_size); } + ldsc = 0; if (get_ldev(device)) { if (device->ldev->known_size != drbd_get_capacity(device->ldev->backing_bdev)) { device->ldev->known_size = drbd_get_capacity(device->ldev->backing_bdev); -- 2.10.0