From patchwork Fri Dec 11 21:36:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 11969489 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 94E31C4361B for ; Fri, 11 Dec 2020 21:36:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 15EE7233A2 for ; Fri, 11 Dec 2020 21:36:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 15EE7233A2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9F0DD6B005D; Fri, 11 Dec 2020 16:36:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9C71A6B0068; Fri, 11 Dec 2020 16:36:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 905756B006C; Fri, 11 Dec 2020 16:36:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0110.hostedemail.com [216.40.44.110]) by kanga.kvack.org (Postfix) with ESMTP id 7AAD46B005D for ; Fri, 11 Dec 2020 16:36:31 -0500 (EST) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 42E92181AF5E1 for ; Fri, 11 Dec 2020 21:36:31 +0000 (UTC) X-FDA: 77582310582.28.coat73_530863127404 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id 267866C13 for ; Fri, 11 Dec 2020 21:36:31 +0000 (UTC) X-HE-Tag: coat73_530863127404 X-Filterd-Recvd-Size: 2608 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf26.hostedemail.com (Postfix) with ESMTP for ; Fri, 11 Dec 2020 21:36:30 +0000 (UTC) Date: Fri, 11 Dec 2020 13:36:27 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1607722589; bh=dy/vexMOeot19V8Dqiad/cPmps1LRViBmFF4Y0w7Dn0=; h=From:To:Subject:In-Reply-To:From; b=EFf7Kworho4zlMbTXZUcKgbrF84obgXaKxCV3F2mjtjoSgAuJLvt2oA1aZME9ToYv 4lKAxNrP4koGstnsoG8aX6XT80zemvVHA52aKgMPSW8OhTGvITxsmNXQRMs7EkiAm2 qToYSFM1pCIV6EQlrk/TTjLxh/BN7UEoBt3t38uI= From: Andrew Morton To: akpm@linux-foundation.org, alex.shi@linux.alibaba.com, ast@kernel.org, daniel@iogearbox.net, gthelen@google.com, jmforbes@linuxtx.org, josef@toxicpanda.com, jrdr.linux@gmail.com, linux-mm@kvack.org, mkubecek@suse.cz, mm-commits@vger.kernel.org, tony.luck@gmail.com, torvalds@linux-foundation.org Subject: [patch 1/8] revert "mm/filemap: add static for function __add_to_page_cache_locked" Message-ID: <20201211213627.Y0ZoNFaFt%akpm@linux-foundation.org> In-Reply-To: <20201211133555.88407977f082963499ed343c@linux-foundation.org> User-Agent: s-nail v14.8.16 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: Andrew Morton Subject: revert "mm/filemap: add static for function __add_to_page_cache_locked" Revert 3351b16af494 ("mm/filemap: add static for function __add_to_page_cache_locked") due to incompatibility with ALLOW_ERROR_INJECTION which result in build errors. Link: https://lkml.kernel.org/r/CAADnVQJ6tmzBXvtroBuEH6QA0H+q7yaSKxrVvVxhqr3KBZdEXg@mail.gmail.com Tested-by: Justin Forbes Tested-by: Greg Thelen Acked-by: Alexei Starovoitov Cc: Michal Kubecek Cc: Alex Shi Cc: Souptick Joarder Cc: Daniel Borkmann Cc: Josef Bacik Cc: Tony Luck Signed-off-by: Andrew Morton --- mm/filemap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/filemap.c~revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked +++ a/mm/filemap.c @@ -827,7 +827,7 @@ int replace_page_cache_page(struct page } EXPORT_SYMBOL_GPL(replace_page_cache_page); -static noinline int __add_to_page_cache_locked(struct page *page, +noinline int __add_to_page_cache_locked(struct page *page, struct address_space *mapping, pgoff_t offset, gfp_t gfp, void **shadowp)