lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <20121206144008.9b376ec7.akpm@linux-foundation.org> Date: Thu, 6 Dec 2012 14:40:08 -0800 From: Andrew Morton <akpm@...ux-foundation.org> To: Naoya Horiguchi <n-horiguchi@...jp.nec.com> Cc: Tony Luck <tony.luck@...el.com>, Andi Kleen <andi.kleen@...el.com>, Wu Fengguang <fengguang.wu@...el.com>, linux-kernel@...r.kernel.org, linux-mm@...ck.org Subject: Re: [PATCH 3/3] HWPOISON, hugetlbfs: fix RSS-counter warning On Wed, 5 Dec 2012 17:14:33 -0500 Naoya Horiguchi <n-horiguchi@...jp.nec.com> wrote: > Hi Tony, > > On Wed, Dec 05, 2012 at 10:04:50PM +0000, Luck, Tony wrote: > > if (PageHWPoison(page) && !(flags & TTU_IGNORE_HWPOISON)) { > > - if (PageAnon(page)) > > + if (PageHuge(page)) > > + ; > > + else if (PageAnon(page)) > > dec_mm_counter(mm, MM_ANONPAGES); > > else > > dec_mm_counter(mm, MM_FILEPAGES); > > > > This style minimizes the "diff" ... but wouldn't it be nicer to say: > > > > if (!PageHuge(page)) { > > old code in here > > } > > > > I think this need more lines in diff because old code should be > indented without any logical change. I do agree with Tony on this. While it is nice to keep the diff looking simple, it is more important that the resulting code be clean and idiomatic. --- a/mm/rmap.c~hwpoison-hugetlbfs-fix-rss-counter-warning-fix +++ a/mm/rmap.c @@ -1249,14 +1249,14 @@ int try_to_unmap_one(struct page *page, update_hiwater_rss(mm); if (PageHWPoison(page) && !(flags & TTU_IGNORE_HWPOISON)) { - if (PageHuge(page)) - ; - else if (PageAnon(page)) - dec_mm_counter(mm, MM_ANONPAGES); - else - dec_mm_counter(mm, MM_FILEPAGES); - set_pte_at(mm, address, pte, - swp_entry_to_pte(make_hwpoison_entry(page))); + if (!PageHuge(page)) { + if (PageAnon(page)) + dec_mm_counter(mm, MM_ANONPAGES); + else + dec_mm_counter(mm, MM_FILEPAGES); + set_pte_at(mm, address, pte, + swp_entry_to_pte(make_hwpoison_entry(page))); + } } else if (PageAnon(page)) { swp_entry_t entry = { .val = page_private(page) }; _ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists