lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 456/717] hugetlb: fix an error code in hugetlb_reserve_pages()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 7fc2513aa237e2ce239ab54d7b04d1d79b317110 ]

    Preserve the error code from region_add() instead of returning success.

    Link: https://lkml.kernel.org/r/X9NGZWnZl5/Mt99R@mwanda
    Fixes: 0db9d74ed884 ("hugetlb: disable region_add file_region coalescing")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
    Reviewed-by: David Hildenbrand <david@redhat.com>
    Cc: Mina Almasry <almasrymina@google.com>
    Cc: David Rientjes <rientjes@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    mm/hugetlb.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/mm/hugetlb.c b/mm/hugetlb.c
    index d029d938d26d6..3b38ea958e954 100644
    --- a/mm/hugetlb.c
    +++ b/mm/hugetlb.c
    @@ -5115,6 +5115,7 @@ int hugetlb_reserve_pages(struct inode *inode,

    if (unlikely(add < 0)) {
    hugetlb_acct_memory(h, -gbl_reserve);
    + ret = add;
    goto out_put_pages;
    } else if (unlikely(chg > add)) {
    /*
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:48    [W:2.842 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site