From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx206.postini.com [74.125.245.206]) by kanga.kvack.org (Postfix) with SMTP id 3ED7F6B0033 for ; Tue, 3 Sep 2013 02:16:34 -0400 (EDT) Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 3 Sep 2013 11:40:20 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id F3B6F3940058 for ; Tue, 3 Sep 2013 11:46:16 +0530 (IST) Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r836IJnt16449726 for ; Tue, 3 Sep 2013 11:48:19 +0530 Received: from d28av05.in.ibm.com (localhost [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r836GR4j030199 for ; Tue, 3 Sep 2013 11:46:28 +0530 From: Wanpeng Li Subject: [PATCH v3 2/3] mm/vmalloc: revert "mm/vmalloc.c: emit the failure message before return" Date: Tue, 3 Sep 2013 14:16:12 +0800 Message-Id: <1378188973-22351-2-git-send-email-liwanp@linux.vnet.ibm.com> In-Reply-To: <1378188973-22351-1-git-send-email-liwanp@linux.vnet.ibm.com> References: <1378188973-22351-1-git-send-email-liwanp@linux.vnet.ibm.com> Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: Joonsoo Kim , David Rientjes , KOSAKI Motohiro , Zhang Yanfei , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wanpeng Li Changelog: *v2 -> v3: revert commit 46c001a2 directly Don't warning twice in __vmalloc_area_node and __vmalloc_node_range if __vmalloc_area_node allocation failure. This patch revert commit 46c001a2 (mm/vmalloc.c: emit the failure message before return). Signed-off-by: Wanpeng Li --- mm/vmalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index d78d117..e3ec8b4 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1635,7 +1635,7 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, addr = __vmalloc_area_node(area, gfp_mask, prot, node, caller); if (!addr) - goto fail; + return NULL; /* * In this function, newly allocated vm_struct has VM_UNINITIALIZED -- 1.8.1.2 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org