From patchwork Mon Dec 9 20:14:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nathan Chancellor X-Patchwork-Id: 11281371 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A5C40138C for ; Tue, 10 Dec 2019 05:30:58 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7606C206D5 for ; Tue, 10 Dec 2019 05:30:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="haEST2d9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7606C206D5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ieY5n-0003lF-TZ; Tue, 10 Dec 2019 05:29:51 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iePQn-0006mY-BO for xen-devel@lists.xenproject.org; Mon, 09 Dec 2019 20:14:57 +0000 X-Inumbo-ID: 9165813e-1ac0-11ea-88e7-bc764e2007e4 Received: from mail-ot1-x343.google.com (unknown [2607:f8b0:4864:20::343]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 9165813e-1ac0-11ea-88e7-bc764e2007e4; Mon, 09 Dec 2019 20:14:56 +0000 (UTC) Received: by mail-ot1-x343.google.com with SMTP id a15so13424576otf.1 for ; Mon, 09 Dec 2019 12:14:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=G4ssoJVMzXYKSaITeXCbCdqWsNm++w07wgKnILG/bgg=; b=haEST2d94B5TmCZrM6JPC6BcdhKhvdNK1ez37JXwt8b1vTyX2uql97OBBZepl9hgh0 Aro/zgnNe+82W8KdhOviCVboGuBF+/B+4B7jckmAQv6Mh9eBErJy3v7HYwHq6JhnAOr5 ugOcjw3VtBQQmYiDrZGc2CN8wAPAmsmDcerXFTMLly5hGp6hwPdTG73Pb3ioBIJuwcmH LVCx9Uj3EuqWgw0pQdq7eFZe4uUGrR9B1sDYT/FqU6Sq9rBSWnfKp7AllvGgkamAyY1D XK1AjGS6WuGZw7vyiKOcEp7zfHtx6DmahqOQJqm0QS045g61YP/46rE9GcmDW8qIsQgn cpDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=G4ssoJVMzXYKSaITeXCbCdqWsNm++w07wgKnILG/bgg=; b=j/rEABfwdKgPpyHKAjAhjjR+1BWviJ3nDuYyYCYfisBtlY5g8d7+O7WNqPEB8aJeW2 qeHx+fiOJMnzspt2egPkNgfreu4X0MaOdbZ07WhRUgbe50iZ9Ymab8NlYzOTGnmoEXd1 ArqaG7A13khudSSEb5Wir8P+5PmY1MpVDjd5Kt05Wdo3T95gC+wlZr4UnmQZUC6h8Wzh LKsw/lgYoiKoQp8Wp2lAYz91upxkihLJPz/EK4HluwZnnT5j4wXX0eZCE3QdWv5TyELs b6Frf6pliW1MhLvOmJcFDtnfmbBPXH8cKE6i1HCC8P7YyNg/YBQz2ftOzv4L/uuhi4m7 AORg== X-Gm-Message-State: APjAAAU2b+10R1AfWyn+QPlc2B0/HvZVxTfya46DA81q0Fhw0hCgsOv2 YHtqLsCBinOFNwF3d5T2AVY= X-Google-Smtp-Source: APXvYqwtJH5AIBsowE8iyT5Wwd/+RpbfvNZzd2/T/yaZlpHGDcKsUA8xSbkAO2wxxt1C7Oi7XlTpyg== X-Received: by 2002:a9d:6f11:: with SMTP id n17mr22298966otq.126.1575922495982; Mon, 09 Dec 2019 12:14:55 -0800 (PST) Received: from localhost.localdomain ([2604:1380:4111:8b00::1]) by smtp.gmail.com with ESMTPSA id z21sm339576oto.52.2019.12.09.12.14.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 12:14:55 -0800 (PST) From: Nathan Chancellor To: Boris Ostrovsky , Juergen Gross , Konrad Rzeszutek Wilk , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , Jens Axboe Date: Mon, 9 Dec 2019 13:14:44 -0700 Message-Id: <20191209201444.33243-1-natechancellor@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 X-Patchwork-Bot: notify X-Mailman-Approved-At: Tue, 10 Dec 2019 05:29:50 +0000 Subject: [Xen-devel] [PATCH] xen/blkfront: Adjust indentation in xlvbd_alloc_gendisk X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, clang-built-linux@googlegroups.com, xen-devel@lists.xenproject.org, Nathan Chancellor Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Clang warns: ../drivers/block/xen-blkfront.c:1117:4: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation] nr_parts = PARTS_PER_DISK; ^ ../drivers/block/xen-blkfront.c:1115:3: note: previous statement is here if (err) ^ This is because there is a space at the beginning of this line; remove it so that the indentation is consistent according to the Linux kernel coding style and clang no longer warns. While we are here, the previous line has some trailing whitespace; clean that up as well. Fixes: c80a420995e7 ("xen-blkfront: handle Xen major numbers other than XENVBD") Link: https://github.com/ClangBuiltLinux/linux/issues/791 Signed-off-by: Nathan Chancellor Reviewed-by: Juergen Gross Acked-by: Roger Pau Monné --- drivers/block/xen-blkfront.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index a74d03913822..c02be06c5299 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -1113,8 +1113,8 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity, if (!VDEV_IS_EXTENDED(info->vdevice)) { err = xen_translate_vdev(info->vdevice, &minor, &offset); if (err) - return err; - nr_parts = PARTS_PER_DISK; + return err; + nr_parts = PARTS_PER_DISK; } else { minor = BLKIF_MINOR_EXT(info->vdevice); nr_parts = PARTS_PER_EXT_DISK;