From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6B71C3B18B for ; Wed, 12 Feb 2020 04:19:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A252E215A4 for ; Wed, 12 Feb 2020 04:19:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="bpV61dLd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A252E215A4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0A0696B03A9; Tue, 11 Feb 2020 23:18:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EFEBF6B03AA; Tue, 11 Feb 2020 23:18:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 704706B03A2; Tue, 11 Feb 2020 23:18:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0167.hostedemail.com [216.40.44.167]) by kanga.kvack.org (Postfix) with ESMTP id B0BA66B03AD for ; Tue, 11 Feb 2020 23:18:48 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 5B7298248068 for ; Wed, 12 Feb 2020 04:18:48 +0000 (UTC) X-FDA: 76480169136.25.smile03_12a3ddfc66004 X-HE-Tag: smile03_12a3ddfc66004 X-Filterd-Recvd-Size: 2341 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf05.hostedemail.com (Postfix) with ESMTP for ; Wed, 12 Feb 2020 04:18:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=UfFsjnMZO/Rq4fYsTDy7TAQ1WDn/2/A9cAH2PPVx4Dc=; b=bpV61dLdwafyzPNxp6FbhzqRwJ XRn6Pl44OIU/41u7z97pqglIliE/1VqmSbRySYbVFJRuVRft/OXdYdyRLmTwpF2EOAPnFqRL15qO1 Qa9Rj/fj1zgklqzpMA+8V+9h9dosTebFWSLFNs5UN1x8Ps6gkKlgYQCJLXJJVhU5yx1wk99j4BH3n zQQzS+2vNL2Uckl/cCaJ5uig19zh2yCoKyNzbW++uU1cObrtqkEOZ16W4xaiGNzCCXxjUIz3K0+3W 6fzXvOVRw8o3SuD+lZD9WyLJDwKJ3Bp4KiGInAH4GKrU0eTmxhESHW7zSeyv7QGwzZwssYGybcAAQ L4PEpiJQ==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1j1jU7-0006p3-Fh; Wed, 12 Feb 2020 04:18:47 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH v2 23/25] mm: Allow large pages to be removed from the page cache Date: Tue, 11 Feb 2020 20:18:43 -0800 Message-Id: <20200212041845.25879-24-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200212041845.25879-1-willy@infradead.org> References: <20200212041845.25879-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: "Matthew Wilcox (Oracle)" page_cache_free_page() assumes compound pages are PMD_SIZE; fix that assumption. Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/filemap.c b/mm/filemap.c index 08b5cd4ce47b..e74a22af7e4e 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -248,7 +248,7 @@ static void page_cache_free_page(struct address_space= *mapping, freepage(page); =20 if (PageTransHuge(page) && !PageHuge(page)) { - page_ref_sub(page, HPAGE_PMD_NR); + page_ref_sub(page, hpage_nr_pages(page)); VM_BUG_ON_PAGE(page_count(page) <=3D 0, page); } else { put_page(page); --=20 2.25.0