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=-14.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,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 3F616C433DB for ; Thu, 14 Jan 2021 18:01:10 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CE27F23B55 for ; Thu, 14 Jan 2021 18:01:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CE27F23B55 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 91ED68D00FE; Thu, 14 Jan 2021 13:01:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8F4508D00F0; Thu, 14 Jan 2021 13:01:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7BC878D00FE; Thu, 14 Jan 2021 13:01:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0206.hostedemail.com [216.40.44.206]) by kanga.kvack.org (Postfix) with ESMTP id 668658D00F0 for ; Thu, 14 Jan 2021 13:01:05 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 2118418172B20 for ; Thu, 14 Jan 2021 18:01:05 +0000 (UTC) X-FDA: 77705146890.26.home56_1b0e37327528 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 5D20A1804A305 for ; Thu, 14 Jan 2021 18:01:04 +0000 (UTC) X-HE-Tag: home56_1b0e37327528 X-Filterd-Recvd-Size: 3607 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Thu, 14 Jan 2021 18:01:03 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 2201A23B7B; Thu, 14 Jan 2021 18:01:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1610647263; bh=UOOQn8aCFd3pZXIiqay3cOTmr2/VUals3JSnLnuVXaQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qw3ul7VZOXmQfLhGGd5KUaxpLTo9scgDthT7+I1yx/5/bWC+jYk/YXgDqPaTjR6ip q+j0W1hvPNLm6VP7PNwpMTwS/qoHIK7JpqxN1XET/v0KaGuDQPe6dKGVWkI5PrwqSU CJvdAWW6XX3mdgCJZz87CHr5jK1YtoDXUh8A9cSk3yKKWhM4O2ccJ/IKt3xfnATUhy QS3QqGrvpCRRpPY+9IsSs/iiBOV558SU9E6BVQyirOBjEpTYLdDkDqjMPvmetjRC2v PEMq+gSvD9MbvyF3RbMCa5FzSUEqy1M8/1Ios9oVY1LcwIZOffLb/cllGifvrETKie 4im6p5nTNgnug== From: Will Deacon To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, Will Deacon , Catalin Marinas , Jan Kara , Minchan Kim , Andrew Morton , "Kirill A . Shutemov" , Linus Torvalds , Vinayak Menon , Hugh Dickins , kernel-team@android.com Subject: [RFC PATCH 7/8] mm: Use static initialisers for 'info' field of 'struct vm_fault' Date: Thu, 14 Jan 2021 17:59:33 +0000 Message-Id: <20210114175934.13070-8-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210114175934.13070-1-will@kernel.org> References: <20210114175934.13070-1-will@kernel.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: In preparation for const-ifying the 'info' field of 'struct vm_fault', ensure that it is initialised using static initialisers. Cc: Kirill A. Shutemov Cc: Linus Torvalds Signed-off-by: Will Deacon --- mm/shmem.c | 8 +++++--- mm/swapfile.c | 13 ++++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 6831d662fe01..4429e488636e 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1520,11 +1520,13 @@ static struct page *shmem_swapin(swp_entry_t swap= , gfp_t gfp, { struct vm_area_struct pvma; struct page *page; - struct vm_fault vmf; + struct vm_fault vmf =3D { + .info =3D { + .vma =3D &pvma, + }, + }; =20 shmem_pseudo_vma_init(&pvma, info, index); - vmf.info.vma =3D &pvma; - vmf.info.address =3D 0; page =3D swap_cluster_readahead(swap, gfp, &vmf); shmem_pseudo_vma_destroy(&pvma); =20 diff --git a/mm/swapfile.c b/mm/swapfile.c index 96ac0725feff..2a21bf3cfdbf 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1951,8 +1951,6 @@ static int unuse_pte_range(struct vm_area_struct *v= ma, pmd_t *pmd, si =3D swap_info[type]; pte =3D pte_offset_map(pmd, addr); do { - struct vm_fault vmf; - if (!is_swap_pte(*pte)) continue; =20 @@ -1968,9 +1966,14 @@ static int unuse_pte_range(struct vm_area_struct *= vma, pmd_t *pmd, swap_map =3D &si->swap_map[offset]; page =3D lookup_swap_cache(entry, vma, addr); if (!page) { - vmf.info.vma =3D vma; - vmf.info.address =3D addr; - vmf.pmd =3D pmd; + struct vm_fault vmf =3D { + .info =3D { + .vma =3D vma, + .address =3D addr, + }, + .pmd =3D pmd, + }; + page =3D swapin_readahead(entry, GFP_HIGHUSER_MOVABLE, &vmf); } --=20 2.30.0.284.gd98b1dd5eaa7-goog