Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755375Ab3G2Fe6 (ORCPT ); Mon, 29 Jul 2013 01:34:58 -0400 Received: from LGEMRELSE7Q.lge.com ([156.147.1.151]:45636 "EHLO LGEMRELSE7Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755145Ab3G2FcY (ORCPT ); Mon, 29 Jul 2013 01:32:24 -0400 X-AuditID: 9c930197-b7bfbae000000e88-1d-51f5fe65e492 From: Joonsoo Kim To: Andrew Morton Cc: Rik van Riel , Mel Gorman , Michal Hocko , "Aneesh Kumar K.V" , KAMEZAWA Hiroyuki , Hugh Dickins , Davidlohr Bueso , David Gibson , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Joonsoo Kim , Wanpeng Li , Naoya Horiguchi , Hillf Danton , Joonsoo Kim Subject: [PATCH 12/18] mm, hugetlb: remove a check for return value of alloc_huge_page() Date: Mon, 29 Jul 2013 14:32:03 +0900 Message-Id: <1375075929-6119-13-git-send-email-iamjoonsoo.kim@lge.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1375075929-6119-1-git-send-email-iamjoonsoo.kim@lge.com> References: <1375075929-6119-1-git-send-email-iamjoonsoo.kim@lge.com> X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1284 Lines: 50 Now, alloc_huge_page() only return -ENOSPEC if failed. So, we don't worry about other return value. Signed-off-by: Joonsoo Kim diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 94173e0..35ccdad 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2562,7 +2562,6 @@ retry_avoidcopy: new_page = alloc_huge_page(vma, address, use_reserve); if (IS_ERR(new_page)) { - long err = PTR_ERR(new_page); page_cache_release(old_page); /* @@ -2591,10 +2590,7 @@ retry_avoidcopy: /* Caller expects lock to be held */ spin_lock(&mm->page_table_lock); - if (err == -ENOMEM) - return VM_FAULT_OOM; - else - return VM_FAULT_SIGBUS; + return VM_FAULT_SIGBUS; } /* @@ -2720,11 +2716,7 @@ retry: page = alloc_huge_page(vma, address, use_reserve); if (IS_ERR(page)) { - ret = PTR_ERR(page); - if (ret == -ENOMEM) - ret = VM_FAULT_OOM; - else - ret = VM_FAULT_SIGBUS; + ret = VM_FAULT_SIGBUS; goto out; } clear_huge_page(page, address, pages_per_huge_page(h)); -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/