From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755233AbcIJUYu (ORCPT ); Sat, 10 Sep 2016 16:24:50 -0400 Received: from mout.web.de ([212.227.17.12]:57506 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751971AbcIJUYs (ORCPT ); Sat, 10 Sep 2016 16:24:48 -0400 Subject: [PATCH 03/13] DRBD-receiver: Move an assignment in receive_uuids() 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: Date: Sat, 10 Sep 2016 22:24:42 +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:EiLmZNbrC1Xg/pXipxRSfvNaHjDeNVgPQmxHPV7/BW1zSATl/bm beMJxG7ScYamgLfevQGaYkYP6n1zdLihmEG21zy2inSjIu5Cx11AuaSjQgJtwlSiBBSN7AH dVksoPoY5ZRMVbBa+J3/Gl0khRNG/09cCUlXAQl5N0x3WF1nyRd8zY3qkyAjNIwT269ixe9 MPqpHsv0SA0ag10PeYK7Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:OA+MywVJUs0=:zDUkm4nSJPfrjol9YrdPqW L0ZkyGycrUxavuSrwyee5APyEAlnFznxID3r4KoeF0uUOlu6EJc8IlEoQHA6k59SHCvvnV5sv mqxF5RntcXB/T6nQt4GY9ssf40rp+NRZ5/wUjYy3Z1ivBcjueTEVpIyTscLh4OK2B38qmgSoO xKeTsjeAojE5wT+YRMf5QxEDkXy1wjxUEAQBL6XMIfjSwpRxtUgAxJ7eDSP1FprpN6o6VZ9Yb xz1gdMG+3Wd7H3gcgbWjUhLSWuhMk5eSmiQZR7kyeRjTU9WUQL6tAZYLGR3RR0TOZVqq4+P/5 6qYm7wlHY7nGEW3gsa6QLcPgJ8q9g7suxF29eRrgssbtXPVwmgUBZgdfTJ1+Q8Vgc/Fby9dyO W4Kw0bbB6GZ6jwMd605orRMm4kl/zGB+JT5U1zKvfIdB5f8feTDRH2Qxpw38pr1LacFHQPk9A TNX8n2mq8ykP4KXl4bNo7LtYP7fVch+RcvfPC2drcjeSqOlAvM52RSjAE/B/SP4+A6LPc7tmB NTxZvXGl274h2xJPKfEP+S71GriZhhAPcrf/8d1DDatjXxUor5KlMjXqD/Qkl8nzAxWVo4100 uI76fppiAAjWtVYCuIJa0w7/EKQXvCxxUklOU5PaHyck4suqg1l5vGXSqG//RKV5aXgjK9y6H HSfNJ0ljO6c8DGvqtd9fXbCHMpO36sbJPo7KvKa8IdyrmdnFqandl5NqdZAxtQwwMShvnDsKx lvvoCR2LIJTz86QcM0EHjmVsTsGqj8L5CY588Jvb01pxn25H6jCes8C4eMSAYBHpoS9XZxmjw gIvyNYU 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 19:37:42 +0200 Move one assignment for the local variable "updated_uuids" so that its setting will only be performed after corresponding memory allocations 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 dab3f74..5526f6b 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -4179,7 +4179,7 @@ static int receive_uuids(struct drbd_connection *connection, struct packet_info struct drbd_device *device; struct p_uuids *p = pi->data; u64 *p_uuid; - int i, updated_uuids = 0; + int i, updated_uuids; peer_device = conn_peer_device(connection, pi->vnr); if (!peer_device) @@ -4206,6 +4206,7 @@ static int receive_uuids(struct drbd_connection *connection, struct packet_info return -EIO; } + updated_uuids = 0; if (get_ldev(device)) { int skip_initial_sync = device->state.conn == C_CONNECTED && -- 2.10.0