Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965651AbcJFJoH (ORCPT ); Thu, 6 Oct 2016 05:44:07 -0400 Received: from mout.web.de ([212.227.17.11]:65077 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S942366AbcJFJoD (ORCPT ); Thu, 6 Oct 2016 05:44:03 -0400 Subject: [PATCH 43/54] md/raid10: Return directly after detection of unsupported settings in setup_conf() To: linux-raid@vger.kernel.org, Christoph Hellwig , Guoqing Jiang , Jens Axboe , Mike Christie , Neil Brown , Shaohua Li , Tomasz Majchrzak References: <566ABCD9.1060404@users.sourceforge.net> <786843ef-4b6f-eb04-7326-2f6f5b408826@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: Date: Thu, 6 Oct 2016 11:43:39 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <786843ef-4b6f-eb04-7326-2f6f5b408826@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:VKAXnzezydid0sCTpzX5jmZcrRKIrVT65EAWfK7nx4+qA/8OOTR rH1xlw2+g0/z/8sQYCcUtr7D3L9pH7P1msFqqX6OBstLGPXY8zW+BDNPZV/uheYgjj5px2R DfmeJ1U36nGYIx/huKqCgH8vjCNpO5b1bXDa/SrvDguaBoz7YlXes/B1i8/FP+SnZwP+Nmv tDOqp8tw6xDNCYp6DiHvA== X-UI-Out-Filterresults: notjunk:1;V01:K0:7q/zLf3Xhgc=:CHeXee5ZF48EWt2s0FGA3y ce0HZ522lx/w83z/Y213KuM/BVrCs0DAwaIj8S225CgdrS7czIkaWeLhOlTEE3on9Ce5JlcJl eXpwhwkN5jR5tQCv/7ty1KraFWVCCiLQwjIswhAQPIn4zXUBwVYzzDVBx1cvAXMJGMHpQnqSs mBQT5bC7ZSKGNskWwIceV41c6GtgcAxyK1+Y3YROHCbiO0r1VTNoyJKioSfLMEtic2PoQQS8i X3nxUfpzCTypQe4Pt5UJ78I9YsnE+QfXcniL/X0bPntrBa41D6cRzVFUV8354D1PWEyB48PFA yRp4bpt/NUH5LYS8ot2aNsGTvVTo72dL2sCzDDyhXwTXmPGmuUlCNrEC/PzI9tzEzVMuS6iMs TLkC2JcmPwGG1hfFp/DVVkbAjAt1J19hvVZ4Xa8uMtKoqZWEPst75RkBMswV+NOZzYzJFHi0I RN1L3ygeZDp8cCtmVVH9PJmhcg78kd3tdKeUUNYyaEmZpScZikqSV82mgEAZsbOumYlqdXmNI hC0/ga5Zowvr/reduwVC1qfSsUjEfM0h0al8aST1TU4htOH7DSOzqc492fIZU7us63u8ZMVT0 mSvHaA4W8JWHQ3yTopvqbFWWivcA6fd624SbKwupEE3jsqXbq0q5NJHpJKFE5WpinVqkZRPxf dnVRvZFnB5ZcI7owW9EMDKYwAMCFBwsjfCYRu7hVp3haOKoBAB6V4ZgxmhGptG/YNEMLBN0IL 1lWelc+Xh7t9UpgYysHASv95nbVkC4mp2oTAU6yiHvqdlfOAtmb+ljo1e6Z9ps7uOffWpyik7 esxJ78G Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1397 Lines: 47 From: Markus Elfring Date: Wed, 5 Oct 2016 17:32:49 +0200 * Return directly after unsupported system settings were detected at the beginning. * Delete the explicit initialisation for the local variables "conf" and "err" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- drivers/md/raid10.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 1f712f7..8326e68 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -3478,8 +3478,8 @@ static int setup_geo(struct geom *geo, struct mddev *mddev, enum geo_type new) static struct r10conf *setup_conf(struct mddev *mddev) { - struct r10conf *conf = NULL; - int err = -EINVAL; + struct r10conf *conf; + int err; struct geom geo; int copies; @@ -3489,13 +3489,13 @@ static struct r10conf *setup_conf(struct mddev *mddev) printk(KERN_ERR "md/raid10:%s: chunk size must be " "at least PAGE_SIZE(%ld) and be a power of 2.\n", mdname(mddev), PAGE_SIZE); - goto out; + return ERR_PTR(-EINVAL); } if (copies < 2 || copies > mddev->raid_disks) { printk(KERN_ERR "md/raid10:%s: unsupported raid10 layout: 0x%8x\n", mdname(mddev), mddev->new_layout); - goto out; + return ERR_PTR(-EINVAL); } err = -ENOMEM; -- 2.10.1