From patchwork Wed Jan 27 00:43:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Ciornei X-Patchwork-Id: 8128141 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 72ED69F859 for ; Tue, 26 Jan 2016 22:44:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 97D0620265 for ; Tue, 26 Jan 2016 22:44:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CA2D720251 for ; Tue, 26 Jan 2016 22:44:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753114AbcAZWoE (ORCPT ); Tue, 26 Jan 2016 17:44:04 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35208 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753000AbcAZWnz (ORCPT ); Tue, 26 Jan 2016 17:43:55 -0500 Received: by mail-wm0-f65.google.com with SMTP id 123so9548wmz.2 for ; Tue, 26 Jan 2016 14:43:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=YOE1sFLttK2EUKhxPC1c5HzKh9De9nuYq5NXJ5qfNrw=; b=D0Rq+Q9LbD+PKlxJg7Hr8t5iHoI6vMfqqLXhn2iddAe8gMILasZ+BEUZtseI+3IlXN gKnkT7YGPHjaGglTkVQ5a/Y3OgCWQIub33jZLC7cJBw0dq2cvBkWMjq9vCpmdkTK/FEz BITPTeJJjK8TfP4SEBmCgmy9l34v9P777eg8lKbohGME1yIYmmxbXv5KcXAkbr062DTB 17Zk8grBm7LaYx3gkElkTKtZTnan7qEbbJXUJ2csz3+bmenf9eWAHi5HFHpJdTndKezn 2/QePbaqAG3RFBrfhZ3Lk/OE8VB6mGdARbJ2PEKSVE0FOBT3KHVNjz1ns4i/8ezTo2B2 viGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=YOE1sFLttK2EUKhxPC1c5HzKh9De9nuYq5NXJ5qfNrw=; b=Hf90F1LkwBo1I6zOiwfvaq2T3gxt07g+8wglPMqYtcZ+9j+ccVBQa5RoMN2tgBfKKC WTyBG0yqeGClTwPGaMJSF0mieMEjaIMBCdBN5SzGIFUi3FHIMaZE1z4ljOOz9OA59nf6 i3q/acHNNPX9DSuKjn36I7Vz+7x3I6qUZyn0HxxlfcnYqjsqduchWbrS+y3mMZeRBQhC ubMdOj5xcF8YGnQVvKp9IREAqLe17CbX1qPHU/v+lqSzHkWxAhVWIe5w3kFagADuYV05 k43I+txqWo/4A5A7InY1qUHEsHppEQktb61Imx8YllYlLoHLPkxbdXqm4zCrCkhSadzG a21Q== X-Gm-Message-State: AG10YOTNcA7m4iUbZJwK9Fl+61bQsGPS9oHBsIU4YuHnRRw6TnuvX07IAaPWwFydshtKEw== X-Received: by 10.194.9.98 with SMTP id y2mr25760413wja.105.1453848234543; Tue, 26 Jan 2016 14:43:54 -0800 (PST) Received: from yoga.localdomain ([62.121.83.220]) by smtp.gmail.com with ESMTPSA id xx3sm3367444wjc.32.2016.01.26.14.43.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Jan 2016 14:43:54 -0800 (PST) From: Ioana Ciornei To: ceph-devel@vger.kernel.org Cc: elder@ieee.org, Ioana Ciornei Subject: [PATCH 6/6] net: ceph: messenger: add braces to all arms of conditional statement Date: Wed, 27 Jan 2016 02:43:39 +0200 Message-Id: X-Mailer: git-send-email 2.6.4 In-Reply-To: References: In-Reply-To: References: Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds curly braces to all arms of the conditional statement in order to follow the linux kernel coding style. Warnings found using checkpatch.pl. Signed-off-by: Ioana Ciornei --- net/ceph/messenger.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 8f1582e..eb71add 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -1313,8 +1313,10 @@ static void prepare_write_message(struct ceph_connection *con) m->middle->vec.iov_base, m->middle->vec.iov_len); con->out_msg->footer.middle_crc = cpu_to_le32(crc); - } else + } else { con->out_msg->footer.middle_crc = 0; + } + dout("%s front_crc %u middle_crc %u\n", __func__, le32_to_cpu(con->out_msg->footer.front_crc), le32_to_cpu(con->out_msg->footer.middle_crc)); @@ -1854,11 +1856,11 @@ static int ceph_dns_resolve_name(const char *name, size_t namelen, delim_p = memchr(name, delim, namelen); colon_p = memchr(name, ':', namelen); - if (delim_p && colon_p) + if (delim_p && colon_p) { end = delim_p < colon_p ? delim_p : colon_p; - else if (!delim_p && colon_p) + } else if (!delim_p && colon_p) { end = colon_p; - else { + } else { end = delim_p; if (!end) /* case: hostname:/ */ end = name + namelen;