Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965098AbcJFJnF (ORCPT ); Thu, 6 Oct 2016 05:43:05 -0400 Received: from mout.web.de ([212.227.17.12]:55408 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S942134AbcJFJnC (ORCPT ); Thu, 6 Oct 2016 05:43:02 -0400 Subject: [PATCH 42/54] md/raid10: Delete an error message for a failed memory allocation 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 , Wolfram Sang From: SF Markus Elfring Message-ID: <06ccc5b5-61e7-aeae-23b4-84dafac8ed05@users.sourceforge.net> Date: Thu, 6 Oct 2016 11:42: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:ivD1JcrNdH0ttl8qByYf8AGhObOkwL8+gVkvdYptFv9GO2tXGN9 CWvHrEf5bHAj5kaBM3lE5X+FgI9JbIE4Kiqavc+iU2ruw1QMXuwdMBKrYacCzWmhQXpzm93 b24Ljg23subkAjJL+evCFToEbMPXi145czbNB4rpdTcLllUKsn2V85E++O+Ep3PAsVtQkwt 9b9LeYcJB9jnxEsGK1tLA== X-UI-Out-Filterresults: notjunk:1;V01:K0:lTNE4yIYNIA=:PJ3gpcrVcEd5gYhDHo6Ihm F9aISi1vtxWv3+UeYM1D0w7plwRrBiaZTEiBSAHobW0uMcdbFG0TUryv+Nd2Pe0DUXuneFFA/ OKN1bQr155CgDjZYYqQP9SMVIrsKVZ5cuxYUcK8azIcasEuZjZFH9tjepPD4F9zo7ylmHZB4S 0CluFhbIaGA0tHhTTD3a3+iqMcMlWc9PaE1dGsBfgUHMyZl8VIb4nCU2AU1h7+xicJQuuLlBH alupNdYePGfjEpiq6azxlJZl5G21DSoDVA2mBE8K+/f3vq2qbiE9VRppnGZMD+SQxBU0Z6NI6 /uYN6TLpYJ5Dx10Q+Ktv84pw4lt327RyyoOanbIgN9Ktm3B/6KnH3wI1ZE9cz5ZvIPLfOco+c ME+Q8kFuL3FpIm2GQqdZm5bK9dZv0UvvhAGcR2cvMLTjArnvA5qrux4XAtdKLx88pOFOYZPgm fOtqTjX1sV69S+oGLQRLZMVm4+VGs0hvBFie41L0hIPOHtuGvDk3kUyidIDCkd92tDh2hzLk8 j8dYD6/R6U/2ir7UcsHjHMWNXVtA+8CYnrf+4eQZ5zqfrFRvb+nH5LWnQqk//tOIF+SNZXT4U yr9NGkixcDyYJb2DtLsf1R2mveWC+gB82RvYMHOpIRsJAsBB4t9PugwBMHF8NzeHZWkuHfhpJ eKT9yfvEDgDdUiDWDXMsy+7lhuWoXpTuNAwQ2VlJvkXE1McPbLzTP6cyjjasZPDOsdftBmR+R Xw2oUrEeFNEt9AJZ8ynUBMTGtyAb+7Qucs+6Kp5/I6YXkIgtLshRybQ/bFrBewu3KdsfVNimU tA+YPYZ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 876 Lines: 28 From: Markus Elfring Date: Wed, 5 Oct 2016 16:57:19 +0200 Omit an extra message for a memory allocation failure (and another corresponding condition check) in this function. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf Signed-off-by: Markus Elfring --- drivers/md/raid10.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 04e8f78..1f712f7 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -3554,9 +3554,6 @@ static struct r10conf *setup_conf(struct mddev *mddev) return conf; out: - if (err == -ENOMEM) - printk(KERN_ERR "md/raid10:%s: couldn't allocate memory.\n", - mdname(mddev)); if (conf) { mempool_destroy(conf->r10bio_pool); kfree(conf->mirrors); -- 2.10.1