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,URIBL_BLOCKED,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 5C87AC433E0 for ; Fri, 15 May 2020 13:40:23 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0C82920657 for ; Fri, 15 May 2020 13:40:23 +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="JSwRLVyB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C82920657 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 CF6FE80057; Fri, 15 May 2020 09:40:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C823480054; Fri, 15 May 2020 09:40:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B6FA880057; Fri, 15 May 2020 09:40:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0111.hostedemail.com [216.40.44.111]) by kanga.kvack.org (Postfix) with ESMTP id A015080054 for ; Fri, 15 May 2020 09:40:19 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 5DDD5180AD801 for ; Fri, 15 May 2020 13:40:19 +0000 (UTC) X-FDA: 76819062558.14.kick44_2c8ee0390d42 X-HE-Tag: kick44_2c8ee0390d42 X-Filterd-Recvd-Size: 2904 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf06.hostedemail.com (Postfix) with ESMTP for ; Fri, 15 May 2020 13:40:18 +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=kXBnruT4KbXQebPUUg3EoL13oF8Mp4vidq1Icbtcla0=; b=JSwRLVyBj6ZOqiNLRjRA6OJGTW odRfxyrzQ2XXez5Etut7e3NAHp6PyviIIsLDxgZxflAG489fyd+U6IfQF6xtJ9DB93pHOoXokzcL3 4SyR/IAozO4/StHbWywL70g3wI570PGILkRNrWzkZBk2Y40IwXqta1Buu7bOgEipaiBRU5VIqqXJb n8Xnff2tILSaKENsc4MnuxxoSLd382TTYDwlJ1XJG+tmaBSgnZnu9ox3Z/18FrJ9HBrB5DQPNpJY1 j6hDTlCM+fWp/w9yExSNiTitfiRy+JQPU/Fh3cCepmSMAjIDbjmEqnRFG1hNv6RUt7f0jJ2eruqhB hDfQXHsA==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jZaD0-0005oD-MU; Fri, 15 May 2020 13:17:02 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 31/36] mm: Add DEFINE_READAHEAD Date: Fri, 15 May 2020 06:16:51 -0700 Message-Id: <20200515131656.12890-32-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200515131656.12890-1-willy@infradead.org> References: <20200515131656.12890-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)" Allow for a more concise definition of a struct readahead_control. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 7 +++++++ mm/readahead.c | 6 +----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 97f36ea16116..29ca36acdfd7 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -718,6 +718,13 @@ struct readahead_control { unsigned int _batch_count; }; =20 +#define DEFINE_READAHEAD(rac, f, m, i) \ + struct readahead_control rac =3D { \ + .file =3D f, \ + .mapping =3D m, \ + ._index =3D i, \ + } + /** * readahead_page - Get the next page to read. * @rac: The current readahead request. diff --git a/mm/readahead.c b/mm/readahead.c index 3c9a8dd7c56c..2126a2754e22 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -179,11 +179,7 @@ void page_cache_readahead_unbounded(struct address_s= pace *mapping, { LIST_HEAD(page_pool); gfp_t gfp_mask =3D readahead_gfp_mask(mapping); - struct readahead_control rac =3D { - .mapping =3D mapping, - .file =3D file, - ._index =3D index, - }; + DEFINE_READAHEAD(rac, file, mapping, index); unsigned long i; =20 /* --=20 2.26.2