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 57207C3601E for ; Wed, 2 Apr 2025 21:06:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C6A72280009; Wed, 2 Apr 2025 17:06:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C1AA5280003; Wed, 2 Apr 2025 17:06:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A6AA5280009; Wed, 2 Apr 2025 17:06:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 8B717280003 for ; Wed, 2 Apr 2025 17:06:25 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E85221206BD for ; Wed, 2 Apr 2025 21:06:26 +0000 (UTC) X-FDA: 83290337172.23.18BB64C Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf04.hostedemail.com (Postfix) with ESMTP id 5C53640007 for ; Wed, 2 Apr 2025 21:06:25 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=lcElZ+Id; dmarc=none; spf=none (imf04.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743627985; a=rsa-sha256; cv=none; b=EcDCEvq6hsSom+5B48vKi1q5SImXOMBCVSFVxSLvg+dCq2HuSC7nzSAgCNjNiBn/WU7rau UXBVsHMFKMIoEtJ3CuD8L90wZzcMxbxYisRYy25heTd2suYfJCRjeUKQzVEXQa05Loect+ 8HPkAFuL75yWARxlbfeFjADjxRW0UtQ= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=lcElZ+Id; dmarc=none; spf=none (imf04.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743627985; 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=ry/obuxLxTCzbCNXr6YZ9DzG0ANUHcRWWnA+CyLV1DU=; b=J76rC6MMSgWLVJnDKzDec3ex5+oLyK6wuid0+hAIWhg0N6bWxG/sqnc6rum3MGMW2ONL7D CID6yiJU6Rg9sd2mrGVAwtHnRVrMH8Snx7c5ucNuv0AaJxt9Mdi+JLbnd2lxs6R36KZHh+ p8w+LZdw966JFbArpYlXTgZlk7XK1mk= 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=ry/obuxLxTCzbCNXr6YZ9DzG0ANUHcRWWnA+CyLV1DU=; b=lcElZ+IdahLQIKtyF8KzPMU59L NT4X71vpSJPq10zxoouw8+d5CKya02jKShsS5nhZ69fPrUt6xX3V4/nX7P2tL2VnWLQv3f1vnWlGq ImaB5sZcdIM/K5lkGCw+2VF10f4XvuQnzUX0jRrJFWeZKD+5fOL93C0+h67BCsdHn6oVeVNBlGII7 IlTD/jKU9oKwrToM1DeNS18ek7GN49PUL0RuZsUCDXFBL8le8RkshsrNBe+WMC58r4RZqUoKbAYxo 6jFOU/4jwp+DbU2++Na6cQuEu/3VOX7qvW9cKFtapVJzHEJ4ehKqYdttzAg6NqFAxMYez3MJINy0r QWP9N8LQ==; Received: from willy by casper.infradead.org with local (Exim 4.98.1 #2 (Red Hat Linux)) id 1u05Hq-0000000AFqM-3I8S; Wed, 02 Apr 2025 21:06:14 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 1/8] filemap: Remove readahead_page() Date: Wed, 2 Apr 2025 22:06:03 +0100 Message-ID: <20250402210612.2444135-2-willy@infradead.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402210612.2444135-1-willy@infradead.org> References: <20250402210612.2444135-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5C53640007 X-Stat-Signature: fdbn8rbfsazegdasrqc3bfk4z4swzdad X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1743627985-58405 X-HE-Meta: U2FsdGVkX1+w/VZlSh36bWlNrgMNpVs/TcRBhLfETeaoFsUNDivW224/Kxq+fk3n7wdFvVdwP878JVROG95ahLsL0LMY2FlUigCvL0zbN6Gg0rVjpxM2g1C+3OxhWfxhoU50s6yn+EA/gKw2cShl85g5fN5j05Ei6GPV/Mavjzv72Osfk48o5PbPOTWDpemAnD8WRXcGz7XKUQDthpEmj6GRGd/mn71NStLl0cklFyNzpEWxUEz2Z6EqXyqOzKqw640maNfsOOJTyGZkOmPoG5tKp8izHD5JcR/oEfjnmC4UXbSY92wpelgxMe1+ihXwAM1FYD+ZH+76wEaNTbxofqHEloEAQZUbWtM5Hu/0YBq5t3X7vTiudMA3O86PU/Pe07aigsR5WyLNqaMGxo/x1I4gZFlBv7QLjCQNl7FgXGUyfQkddKas0G77TwScs5za8fvzwOQDmpIjZjWYo4YXNkvXsKOu90OcPioFtDNKXQrEG2x8zZzbbVD+MwvRiJHTvQYKk+0H+jUtahzK3RQLniBTH+tACVkiIej1XYcKpWdzcC8I19XDEyRR1a/9YvuylfcV2RIR3GL225+SIDtakcXHgRrT9aQDMgiy430vYKEjmtCS9iTC0rkl0NlJkQf1OXD+3X8Au4HMNsfEDdzoNDk9NcG5lvW3LRcyxjzSkTXE3dum0KRrIIywzKZzEUm9JcNsHOJ8IuchRXehqR5bwTGorkBBlfFnB5yVfJsiBfRfO+8zBSwWme4bwba++44spBrvUYvJYx/A5/BVekWVlW8Q8DE4jiC9j+0+HlNDkr/2A/95XhJv5i+4fy9ODqFSn+8GWR+6oWcv1VU6UxWuKZVgYzERGB1FVcvPw3uL/nqswTBBPYvkiSXTavwFtlWsyx6qWrtz3ecFOAOseKfkIPf8zoIO+XFNZ8LwlXVTQy43NtPwyk5Zar0WQOy2xQ0RQtk43PIZXSYtGjozcir jxJ3iRY0 0OabsF2oBmmG5OwZngJIhXEGH4oChIMSuCVgdpGI20Eo9lyL9Ga8Ks23gI1kaqr/QtseP3NPkliIve5jA1MLz6GCLCGFhaEmgxNkHGZaOOlms4Exj26B9MPhzTgtICvLb6OpDJc+0bi+HxADRNozFEa12MXTLa1SLWQRyagrughMH1xO3aA15oiyQSLpAsdp2NFMaUfuNRiDeuFVpkCHIL7U68uYKd7spCgUxrNN2FxXe8s/kLlMDQzJk5XykeoF4gUtWgc6NgTZ6mFFFuJcPwb0bNGmTjObjBsKX 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: List-Subscribe: List-Unsubscribe: All filesystems have now been converted to call readahead_folio() so we can delete this wrapper. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 26baa78f1ca7..cd4bd0f8e5f6 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -1308,9 +1308,9 @@ static inline bool filemap_range_needs_writeback(struct address_space *mapping, * struct readahead_control - Describes a readahead request. * * A readahead request is for consecutive pages. Filesystems which - * implement the ->readahead method should call readahead_page() or - * readahead_page_batch() in a loop and attempt to start I/O against - * each page in the request. + * implement the ->readahead method should call readahead_folio() or + * __readahead_batch() in a loop and attempt to start reads into each + * folio in the request. * * Most of the fields in this struct are private and should be accessed * by the functions below. @@ -1415,22 +1415,6 @@ static inline struct folio *__readahead_folio(struct readahead_control *ractl) return folio; } -/** - * readahead_page - Get the next page to read. - * @ractl: The current readahead request. - * - * Context: The page is locked and has an elevated refcount. The caller - * should decreases the refcount once the page has been submitted for I/O - * and unlock the page once all I/O to that page has completed. - * Return: A pointer to the next page, or %NULL if we are done. - */ -static inline struct page *readahead_page(struct readahead_control *ractl) -{ - struct folio *folio = __readahead_folio(ractl); - - return &folio->page; -} - /** * readahead_folio - Get the next folio to read. * @ractl: The current readahead request. -- 2.47.2