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.5 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 ABF3AC433E5 for ; Fri, 29 May 2020 02:58:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 70C8F207D3 for ; Fri, 29 May 2020 02:58:52 +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="LSg3zjLm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 70C8F207D3 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 F35DE800BF; Thu, 28 May 2020 22:58:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2620C800C8; Thu, 28 May 2020 22:58:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B8E3F800C5; Thu, 28 May 2020 22:58:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0123.hostedemail.com [216.40.44.123]) by kanga.kvack.org (Postfix) with ESMTP id 27144800BD for ; Thu, 28 May 2020 22:58:29 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id E6997824556B for ; Fri, 29 May 2020 02:58:28 +0000 (UTC) X-FDA: 76868248296.09.plate77_fcf396b96a5a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin09.hostedemail.com (Postfix) with ESMTP id CB490180AD822 for ; Fri, 29 May 2020 02:58:28 +0000 (UTC) X-HE-Tag: plate77_fcf396b96a5a X-Filterd-Recvd-Size: 2904 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Fri, 29 May 2020 02:58:28 +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=3qQKXoQh4g5s8eDI27YZDDnW8Glo9jzDEC+FUmQG6Xw=; b=LSg3zjLmffQHADrEul/AJqBr/D G+SIrQRxm2P3vQv3+86yfDMdR9C61SYmTr1u4o7pqrtbt4Xq4NXQmEcYh9syXEpgo6uzz1uRwZp40 R093rV/2v5K+1NdC+tHqxsVA8+CsIuh4Lf/KHZB5M2Bltc5YpMSj2duRilK7s4WrIynpH+XibWYfy t2G/eqQTyJrykbUvBHOt7FjuzwBMttlCU9QGSnIYhu1jm0pP/OuXmqzR7mjEZoEUHl25YOJ0uiQAn 2Y/zGT1bqZxrOV9M8Sq2XwmPpahh3rBkyz65XwaH8sHnK8qq22mvGQOxD/nJGMwV0HqFKV1CMC3a4 jG0Dl3BQ==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jeVE3-0008Td-TR; Fri, 29 May 2020 02:58:27 +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 v5 34/39] mm: Add DEFINE_READAHEAD Date: Thu, 28 May 2020 19:58:19 -0700 Message-Id: <20200529025824.32296-35-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200529025824.32296-1-willy@infradead.org> References: <20200529025824.32296-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: CB490180AD822 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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 0b4a4b62b585..84ba69477e3b 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -719,6 +719,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