LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Adrian Bunk <bunk@kernel.org>
To: wli@holomorphy.com
Cc: linux-kernel@vger.kernel.org
Subject: [2.6 patch] mm/hugetlb.c: fix duplicate variable
Date: Mon, 25 Feb 2008 02:09:48 +0200 [thread overview]
Message-ID: <20080225000948.GP2088@cs181133002.pp.htv.fi> (raw)
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 <bunk@kernel.org>
---
mm/hugetlb.c | 1 -
1 file changed, 1 deletion(-)
--- linux-2.6/mm/hugetlb.c.old 2008-02-24 23:17:52.000000000 +0200
+++ linux-2.6/mm/hugetlb.c 2008-02-24 23:26:07.000000000 +0200
@@ -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
next reply other threads:[~2008-02-25 0:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-25 0:09 Adrian Bunk [this message]
2008-03-30 22:53 Adrian Bunk
2008-04-14 18:14 Adrian Bunk
2008-04-21 22:50 Adrian Bunk
2008-05-05 18:28 Adrian Bunk
2008-05-05 20:11 ` KOSAKI Motohiro
2008-05-05 20:19 ` Adrian Bunk
2008-05-05 20:28 ` KOSAKI Motohiro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080225000948.GP2088@cs181133002.pp.htv.fi \
--to=bunk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wli@holomorphy.com \
--subject='Re: [2.6 patch] mm/hugetlb.c: fix duplicate variable' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).