From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752444AbbJSMOz (ORCPT ); Mon, 19 Oct 2015 08:14:55 -0400 Received: from mx2.parallels.com ([199.115.105.18]:51399 "EHLO mx2.parallels.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750839AbbJSMOy (ORCPT ); Mon, 19 Oct 2015 08:14:54 -0400 From: Vladimir Davydov To: Andrew Morton CC: "Kirill A. Shutemov" , , Subject: [PATCH] mm: do not inc NR_PAGETABLE if ptlock_init failed Date: Mon, 19 Oct 2015 15:14:41 +0300 Message-ID: <1445256881-5205-1-git-send-email-vdavydov@virtuozzo.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-ClientProxiedBy: US-EXCH2.sw.swsoft.com (10.255.249.46) To US-EXCH.sw.swsoft.com (10.255.249.47) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If ALLOC_SPLIT_PTLOCKS is defined, ptlock_init may fail, in which case we shouldn't increment NR_PAGETABLE. Since small allocations, such as ptlock, normally do not fail (currently they can fail if kmemcg is used though), this patch does not really fix anything and should be considered as a code cleanup. Signed-off-by: Vladimir Davydov --- include/linux/mm.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 6adf4167d664..30ef3b535444 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1553,8 +1553,10 @@ static inline void pgtable_init(void) static inline bool pgtable_page_ctor(struct page *page) { + if (!ptlock_init(page)) + return false; inc_zone_page_state(page, NR_PAGETABLE); - return ptlock_init(page); + return true; } static inline void pgtable_page_dtor(struct page *page) -- 2.1.4