From patchwork Fri Jun 9 10:19:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 103457 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp135634qgd; Fri, 9 Jun 2017 03:20:10 -0700 (PDT) X-Received: by 10.84.215.149 with SMTP id l21mr40369230pli.31.1497003609971; Fri, 09 Jun 2017 03:20:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497003609; cv=none; d=google.com; s=arc-20160816; b=BWOTeZTrl+w2DIXcrijAh1hLwMn0Ep+JQwUIptZBc5mdwaWSHeAjATTH1LZSSiW52g Jvnmn1rUWVIr7aBrrggrkMk2xlboc3ale6EjqeT4JiHHQ68rbGD3cBNd9XG+tnNtAsj7 zqZPGu45KXOSIxUMYpbrckpHiTrPgFW6vh5LIMUOJ+68SjUwddo89vmNw1KDCH29YGCf oikkP6NsVJ+nCh8I/VEW6wwph78s9fF/0BgwmJGvSGwCX6r3cTq8bd52+KcICNHXfppo RFsHaWREFrXk9xLZEdy9UcpxNCzlVdDQpzk2jsExOuYmn/4uC4FSeo4eFTm5GP6N8W7x DrRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=R/NEVbJg0ku95CmaqSuUhGS+8euTyzXJx+HK91uzncI=; b=jUGhJ1B1QegsIC0ncPy0CPUrlxBixfeAOZSoPByG/AhbrKCRqgCuY8oa/6CF0akZqK 8hLYZ+tjRvxhx1t4k0QTTvS4IHzrtSsIOpYCiBABtJnazAPFYSGmc2siTA/l0LX8uqPQ 7vBNXg32Wk/XgrYKiQhAUBiDD3zSvCr4lgWdTHQnp2Tx/Af4yfVSlRAwiptNXrp/hR7O INQoIQ3apJdfadQy4/w2/i5PKdoQKnAXrOPMThls1uxSzDh/rcdiUoviePK3YvCBgUmX oK5mTagczaLfxb4zXPYZ8Kf4F28c0W7H4vPhCyXQagQk/2m9TAeesB84wkBZWq0gzmhu OxEw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b63si6588213pga.395.2017.06.09.03.20.09; Fri, 09 Jun 2017 03:20:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751668AbdFIKTu (ORCPT + 25 others); Fri, 9 Jun 2017 06:19:50 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:63576 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751531AbdFIKTt (ORCPT ); Fri, 9 Jun 2017 06:19:49 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0MUW15-1dRh541jJT-00RJYi; Fri, 09 Jun 2017 12:19:41 +0200 From: Arnd Bergmann To: Jens Axboe Cc: Arnd Bergmann , Ming Lei , Hannes Reinecke , Omar Sandoval , linux-kernel@vger.kernel.org Subject: [PATCH] loop: fix error handling regression Date: Fri, 9 Jun 2017 12:19:18 +0200 Message-Id: <20170609101938.2807152-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:nceKgNb8lUFithpPgX/xGrU/n9Kt2cDCiApGwpORzQVjiR9FnhS nm/P5MP8odgrQ7Z3jKO0fQ4OP+xw2VwKDnTpb0wOrpH4qA7FJ+TPz6VJCyg2RI2H0l/hvuT nkbWXol46JEqM6N7bH9k9YCT8zR/wpq6zXdVXy7pv0xS7PsKDj9gs2yigAQQaiaboBVPhZj Y4zMiHG+Yjx+yEOZxJaig== X-UI-Out-Filterresults: notjunk:1; V01:K0:2BL5myycVUM=:dfTbATavXviUjofSd8ToMO MuQSmA/c9CWKBE/YCoysAkvnLEeV2PFLRQFd/ihtOteBhs7Id30WWFBtIM/iognGCqHQyR/2g 0gRHCHc6THqgMk7jrGVR02fwYYy1j2CP7pxBYc7GQ9e//JtEfRSbTq7MWdzqG2KH0jXKhcBK6 MK1BYgDNpD/ikhkZcr65VnoxPoojRwpxtxW5gvxoLad3jCP7GCpo92NtbuRJrwa89IyzfOeMq us/n767hkuR2oYZL7JEaK6sDovndql65OJv4HhftdFTQtnat1GXaxdfBqL5LOW/pg/3uP2N4x mXYrnQO3w/CFpZJLOknd1RayCOv/OKFq6OnS/3mRLPwjmA5f+rh/hloHpMtAh9zcl9S2PAJeu VgDFRDigJcHJMWpe7lnROg7vCWKDIzyBErvdwCy2kbBdWSuPzxUWpbQLGNILXD41g9kqfAKsQ 5lCZ6QWcoh1qjoDbuGVrTYXCZtF0PWSvajMVnP4zTIRoBKsaG6MTzyps6/gu2v9O86zkmSJO3 WCTygcLaov8MbBs8xz8u0Ha/4w+gyka44NRjYKIGqZq69Ae13MYBpjvJvzJT3Maw0C5tW7jzA OGGACVaIuEribtc8+RwKhpkvJLsXp+H6gfjIsF8cABpvEGpFNOomegPOSAT+xBzpxihiF/899 iUxDtQFmYgLltNlXqVu5bFYEhVz9rkLTMMu0haGusOhZhNr1LTMyf62YqfOJxQicsaXY= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc points out an unusual indentation: drivers/block/loop.c: In function 'loop_set_status': drivers/block/loop.c:1149:3: error: this 'if' clause does not guard... [-Werror=misleading-indentation] if (figure_loop_size(lo, info->lo_offset, info->lo_sizelimit, ^~ drivers/block/loop.c:1152:4: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' goto exit; This was introduced by a new feature that accidentally moved the opening braces from one condition to another. Adding a second pair of braces makes it work correctly again and also more readable. Fixes: f2c6df7dbf9a ("loop: support 4k physical blocksize") Signed-off-by: Arnd Bergmann --- drivers/block/loop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.9.0 Reviewed-by: Hannes Reinecke diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 4d376c10a97a..e288fb30100f 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1147,10 +1147,11 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info) ((lo->lo_flags & LO_FLAGS_BLOCKSIZE) && lo->lo_logical_blocksize != LO_INFO_BLOCKSIZE(info))) { if (figure_loop_size(lo, info->lo_offset, info->lo_sizelimit, - LO_INFO_BLOCKSIZE(info))) + LO_INFO_BLOCKSIZE(info))) { err = -EFBIG; goto exit; } + } loop_config_discard(lo);