From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932650Ab3IYBEH (ORCPT ); Tue, 24 Sep 2013 21:04:07 -0400 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:52049 "EHLO e23smtp02.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757039Ab3IYBEE (ORCPT ); Tue, 24 Sep 2013 21:04:04 -0400 From: Wanpeng Li To: Andrew Morton Cc: Joonsoo Kim , David Rientjes , KOSAKI Motohiro , Zhang Yanfei , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wanpeng Li Subject: [PATCH v7 4/4] revert mm/vmalloc.c: emit the failure message before return Date: Wed, 25 Sep 2013 09:02:44 +0800 Message-Id: <1380070964-12975-4-git-send-email-liwanp@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1380070964-12975-1-git-send-email-liwanp@linux.vnet.ibm.com> References: <1380070964-12975-1-git-send-email-liwanp@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13092501-5490-0000-0000-00000434D92C Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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). Reviewed-by: Zhang Yanfei Signed-off-by: Wanpeng Li --- mm/vmalloc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index e523a14..fa4eee8 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); if (!addr) - goto fail; + return NULL; /* * In this function, newly allocated vm_struct has VM_UNINITIALIZED -- 1.7.5.4