From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755829AbdETUUp (ORCPT ); Sat, 20 May 2017 16:20:45 -0400 Received: from mout.web.de ([212.227.17.11]:63857 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751782AbdETUUn (ORCPT ); Sat, 20 May 2017 16:20:43 -0400 To: Nicolas Schichan , kernel-janitors@vger.kernel.org Cc: LKML , Wolfram Sang From: SF Markus Elfring Subject: [PATCH] init: Delete an error message for a failed memory allocation in rd_load_image() Message-ID: Date: Sat, 20 May 2017 22:20:37 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:dTWeizLQyUji4q0COKCr74jgSOps9LrIVUOtCuMKsXZgsTlUdXi yZn8SGizVj+mjlW9lJGIOGsKt0wOABEmEaVoRxlgrB9jGsXei/mei4WuVYfYbDmWD7foje9 Ja9RQK0jKFAW8qGvPlDLeCFUg10czKOgTYIxPR+G9uWfcsZBZRzRtxrhCA7+5NoGJPxGD4S XC9g+jDzpMu2Yo83EuXtg== X-UI-Out-Filterresults: notjunk:1;V01:K0:gI7e4ukJ/vI=:YivL7dSGQXspMMkT2e285S Sxt+3zgRSLEXDlWhMS59BGdUivuPternPmfkJ7XDrwpZwRHR0ygwmb8tAviFXReKf8iz8E2q/ Qqo6EmhMx9wBmr8F6LpRboVCyPaW4lRdGVwYBPQe71p9rc5zQO9o0Mgvln1slAn7U1Cczeypl h4criQk6g6lS55vgAHylHik8BlBm38ChthytcPLmXbpyPlNfr54UrsAIH46pe/54sWN85XVvv OyAm6LVi6aHIcaVmKjcABlEw1Eb123uvY8M24Obqf/abf89gF+I1rjjSHjzsiKWM33t33I1q5 Vn+nTf8sYPQI0ZnJMORM0NaSFqvzPcIri/I24FqKIkdpMkAChFvytKTS+6zLOAW5ozxhfflrw BTYFivYCP6AvByBxUWoh2kqJ5fh3ozDB9SqsjswUZmYuJFurs6FsS5+POcjyDRQOOd8Bhz41F GsA/rCNaPL9vnik2JvSuAfqw/k7RPNa+pOfwNOShnkwPMRU++Uh3OQozN27yj9+GXH+CH0If9 wxQwAqbCIQ5I3qJykrm0/zKiBFIoZrbdETFv1w81b56TtD+V0nV6eis/qIp3GPgMEQAJWQJ+L rr3Jap1XpexVRy/g7fBhBu8I9mlZAzvmCfaxEsU14dvIIRAypgaGMm5KDeQYF+uYcchRgVWZd mpL6Q9uQ4srTeu+cdEQ5sjG8ikODKxtpvTzDFWL2eOVa2TRRYoGW9pkYSnyrUwAZMtWZA+2Yi X1oDN7hXBgUtSpPrsh8au8/bxXekklu/lfgVG7kkfMS5RaUcjJ/ZGWes5qwNKPnGSVxnNRPna 2oJQ6J0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 20 May 2017 22:14:36 +0200 Omit an extra message for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf Signed-off-by: Markus Elfring --- init/do_mounts_rd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c index dd4104c9aa12..47cafb189ad3 100644 --- a/init/do_mounts_rd.c +++ b/init/do_mounts_rd.c @@ -245,10 +245,8 @@ int __init rd_load_image(char *from) } buf = kmalloc(BLOCK_SIZE, GFP_KERNEL); - if (!buf) { - printk(KERN_ERR "RAMDISK: could not allocate buffer\n"); + if (!buf) goto done; - } printk(KERN_NOTICE "RAMDISK: Loading %dKiB [%ld disk%s] into ram disk... ", nblocks, ((nblocks-1)/devblocks)+1, nblocks>devblocks ? "s" : ""); -- 2.13.0