mm/hugetlb.c: fix duplicate variable
Subsystems (2)
PATCH 1/1 mm/hugetlb.c: fix duplicate variable
It's confusing that set_max_huge_pages() contained two different variables named "ret", and although the code works correctly this should be fixed.
The inner of the two variables can simply be removed.
Spotted by sparse.
Signed-off-by Adrian Bunk <[email protected]>
---
mm/hugetlb.c | 1 - 1 file changed, 1 deletion(-)
mm/hugetlb.c renamed from mm/hugetlb.c.old +0 -1
@@ -518,45 +518,44 @@static unsigned long set_max_huge_pages (unsigned long count) {unsigned long min_count, ret;/* * Increase the pool size * First take pages out of surplus state. Then make up the * remaining difference by allocating fresh huge pages. * * We might race with alloc_buddy_huge_page() here and be unable * to convert a surplus huge page to a normal huge page. That is * not critical, though, it just means the overall size of the * pool might be one hugepage larger than it needs to be, but * within all the constraints specified by the sysctls. */ spin_lock (&hugetlb_lock);while (surplus_huge_pages && count > persistent_huge_pages) {if (!adjust_pool_surplus (-1 ))break ; }while (count > persistent_huge_pages) { -int ret;/* * If this allocation races such that we no longer need the * page, free_huge_page will handle it by freeing the page * and reducing the surplus. */ spin_unlock (&hugetlb_lock); ret =alloc_fresh_huge_page ();spin_lock (&hugetlb_lock);if (!ret) goto out; }/* * Decrease the pool size * First return free pages to the buddy allocator (being careful * to keep enough around to satisfy reservations). Then place * pages into surplus state as needed so the pool will shrink * to the desired size as pages become free. * * By placing pages into the surplus state independent of the * overcommit value, we are allowing the surplus pool size to