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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F55DC433FE for ; Wed, 19 Oct 2022 18:33:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BE21F6B007B; Wed, 19 Oct 2022 14:33:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B91B46B007D; Wed, 19 Oct 2022 14:33:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A342D6B007E; Wed, 19 Oct 2022 14:33:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 952586B007B for ; Wed, 19 Oct 2022 14:33:46 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5841781025 for ; Wed, 19 Oct 2022 18:33:46 +0000 (UTC) X-FDA: 80038547652.28.BEBF8DF Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf23.hostedemail.com (Postfix) with ESMTP id E3830140010 for ; Wed, 19 Oct 2022 18:33:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=ysoUf3dfmvgjEwbCn31NyFUDhqvX2YiWUDA58R3Kp4Q=; b=EaoSPp2mCqVBV8J0A8xUmEgYQr ps2NurzLA/JjV3/T6QpaR912UZXtsURtq/4UZPuOMNHkr8q0Y2c/0LH9D784k36FB1x/bDesav2Lx va6AZie1WQDOGwcdyDCND7TMUqopRlDnAiTLhOtJvTj77Xho0sQ0xZQVz7Mx7qSX+ns3VLUiGNHZv h4//MkAPhGQDSBUZfDOsJIlptYKHg8xmIWWrXRebK/6Sp+ZRnPgAfy9dXRfIe11dyf/Urj1hjyVm3 8Z453iXhxxHpt2ddGEiGlDhnO14mIWYFSnmN2xkOR710C6b4Rep7pwZTZYb22L3OzMmvjb6cm6V/V rNQ8jO3A==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1olDsm-00BkzI-SG; Wed, 19 Oct 2022 18:33:36 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 4/4] mm: Remove FGP_HEAD Date: Wed, 19 Oct 2022 19:33:32 +0100 Message-Id: <20221019183332.2802139-5-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221019183332.2802139-1-willy@infradead.org> References: <20221019183332.2802139-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666204426; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ysoUf3dfmvgjEwbCn31NyFUDhqvX2YiWUDA58R3Kp4Q=; b=QCxkaLUBATu3GJgxejXuwzdO89ai1qtOrL4YYMEf8rhF2ijg221iyRHEaKJyBypm9EpU7h v+xkIpylojRQX+oOj5IKNlu4qyOosB/XXiWuyxEc/4q6rJom07MrDWtgfjcWc5TUieUzzn x6eqB4F0QILgodjyumZ5+Ts8HAYelks= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=EaoSPp2m; spf=none (imf23.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666204426; a=rsa-sha256; cv=none; b=J4VmFOLYSQTbtWtv4ivZARgo40JntT0PL4P70xqIhiYqhSzg8/hFOsTmqYbPxBTuvjj7rR 1/ljVg4tbS/fotgeoMg8iG7p2WY5wEvpR+by8mZ735W2SutVzvgaMLXxfcoD+84oSCazqa Sz4Tz10g8iHsnxcFxLsQQsmssDhRA2o= Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=EaoSPp2m; spf=none (imf23.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Stat-Signature: cabok4c4kkn48pgaztq1ca8cmod14r16 X-Rspamd-Queue-Id: E3830140010 X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1666204425-271528 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: This is no longer used; all callers have been converted to use folios instead. Somehow this manages to save 11 bytes of text. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 5 ++--- mm/folio-compat.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index bbccb4044222..f690c979913d 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -504,9 +504,8 @@ pgoff_t page_cache_prev_miss(struct address_space *mapping, #define FGP_NOFS 0x00000010 #define FGP_NOWAIT 0x00000020 #define FGP_FOR_MMAP 0x00000040 -#define FGP_HEAD 0x00000080 -#define FGP_ENTRY 0x00000100 -#define FGP_STABLE 0x00000200 +#define FGP_ENTRY 0x00000080 +#define FGP_STABLE 0x00000100 struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, int fgp_flags, gfp_t gfp); diff --git a/mm/folio-compat.c b/mm/folio-compat.c index e1e23b4947d7..4eab4e505e85 100644 --- a/mm/folio-compat.c +++ b/mm/folio-compat.c @@ -108,7 +108,7 @@ struct page *pagecache_get_page(struct address_space *mapping, pgoff_t index, struct folio *folio; folio = __filemap_get_folio(mapping, index, fgp_flags, gfp); - if ((fgp_flags & FGP_HEAD) || !folio || xa_is_value(folio)) + if (!folio || xa_is_value(folio)) return &folio->page; return folio_file_page(folio, index); } -- 2.35.1