From patchwork Wed May 17 13:11:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13244902 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 6FFFBC77B7F for ; Wed, 17 May 2023 13:13:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 09950280002; Wed, 17 May 2023 09:13:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 04968900003; Wed, 17 May 2023 09:13:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5403280002; Wed, 17 May 2023 09:13:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id D777E900003 for ; Wed, 17 May 2023 09:13:13 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B003416057F for ; Wed, 17 May 2023 13:13:13 +0000 (UTC) X-FDA: 80799787866.08.542ACAC Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf25.hostedemail.com (Postfix) with ESMTP id B8980A000F for ; Wed, 17 May 2023 13:13:11 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=D1+6zXZH; spf=pass (imf25.hostedemail.com: domain of arnd@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=arnd@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684329191; 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=3sSHNXtlfuNU1od92qd1KeO5qLCYolRFHEfi89lB+uc=; b=NcqJNvBVkGK5cEmFMOzjkkoACvUwxOxxY3hP9QnjDP6JYT9RMoZvMsjh6uf3Q1d5bFgvB7 byHpgXYpWYyrswjzeSlKed/jwh97zgKX0cuLZpDpiikHz6zupyQX1GEEm/5DVFPVTDVAZ9 tstAkteiRgHDadL53kYoGfP+k2Ylsq0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684329191; a=rsa-sha256; cv=none; b=UYrikqY6bxWGCQIqitn6XCwWiUhP3BJFa4T7cBQPtpoVEXkw/B4GOiG3XTqRxSvYc5Hve1 2PpEMKQUvH0vH9qP8y4AK9FZuJbrDdQ6skJr3bAj99xg5NMCsq/GI2Hmmdf5+eMZGKUX5m G8U9jxwW7HmifZuDssN+n5nFRtuHwSY= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=D1+6zXZH; spf=pass (imf25.hostedemail.com: domain of arnd@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=arnd@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E6D6D642BB; Wed, 17 May 2023 13:13:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82ACBC433A1; Wed, 17 May 2023 13:13:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684329190; bh=d19FT2UXzed3oRWIfJJFjSTk/2JiLUfj9No4RlO7/6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D1+6zXZHFnxnG+wOAs+I7Jk3ZmwjP67pJgzP0uRLk1KweQErWDtrD6kcCaiJbOcnT FeyForINJFNNHVR7SlZDLxBqXsy6U1Q8QSU2g7HzT+HDxANY+2tRRB/juS7IWqHnN0 R7uJEX9uIR2BJ1iVGwpgqVvJxOimPbuxDH8nVE33oigOLH+a2C6WGLVT5O2FBvlKz1 1cchN4Ol9FfjcJdHRvb6NG6ME/EGUJBb5JSRXXIOYIHDL60v7knAjAptFgq2qEdzKr kBNHvdOcis7Z2szvD6pixKpaEvKxiNP2G0OykAdHnW8HCBkYh+jiZUMYx1rLc8DsBc EwxZhq5xDzb7g== From: Arnd Bergmann To: Andrew Morton Cc: linux-mm@kvack.org, Arnd Bergmann , Russell King , Catalin Marinas , Will Deacon , Michal Simek , Thomas Bogendoerfer , Helge Deller , Michael Ellerman , Palmer Dabbelt , Heiko Carstens , Thomas Gleixner , Ingo Molnar , x86@kernel.org, "Rafael J. Wysocki" , Paul Moore , Eric Paris , Dennis Zhou , Tejun Heo , Christoph Lameter , Pavel Machek , Peter Zijlstra , Waiman Long , Boqun Feng , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, audit@vger.kernel.org, linux-pm@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com Subject: [PATCH 12/14] init: move cifs_root_data() prototype into linux/mount.h Date: Wed, 17 May 2023 15:11:00 +0200 Message-Id: <20230517131102.934196-13-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230517131102.934196-1-arnd@kernel.org> References: <20230517131102.934196-1-arnd@kernel.org> MIME-Version: 1.0 X-Stat-Signature: n49cdeb7difbcou1ni57oz8mgctkrrj3 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: B8980A000F X-Rspam-User: X-HE-Tag: 1684329191-216295 X-HE-Meta: U2FsdGVkX1/mOlcHnKuAczeKErkVhDC9tpr4nRzSTCQRpO4HBrcXnFgHDsYE8wnIDWX7F7Dn7xbqJWqrdwszlJStDl/WQbSyET1FkS5RH/bOSnV68ypnyoGl+s0LYkPzeENZrdokdvt5IYQUP2l1V7fS2pLSG/gfx2ysirQQgDnCWizGPTjvJsDPpory91kaWBxtwNY9I0QL+KbL//PmExRc2rQek10xoGToAwC5M6pwL+rDvANxmsXI0oeXFmJSli+w8RszLobXXr4B9jbJ2/qKDU1au6XPgBsIUXHMH7mGJdEDoyvZDsFnvDRI4++LM2AO6aJAJmO3zppZxZVJ+CpBb9bmMVOSKPY9NpOsEci3iVGaG1m+DRrIcoNV6x/5ikck/va2fJ8r+BjWQ/U1gwIC0ufOHTOJ21cIDKmpNB1BcPHL7YWBCkgZT0ukax4+h2LjTVjCD2zL2vJyaenieTyHZ2QrSQS8iMr5baeYS2IGtKyiXhC3r391ZldEJON0ALNKux9XMpk32/6cKxratmSn4GDV31zQvUJGXlbRjTiEPRBt/c8TwgL0WkXGLRHBlauuAfbGOeRJ+OJDEk7OcUGO8S/b09uxXjP11DYKn7mx25cHy74LeTYS7KIyL79R+T2b3Qpxa4xdkhHWwQMMLbia6JCAlxeFfNFndmQys0FNJa8ybB1bDvZhj13ayGyWPD/djWI+XBMZJxMz1BNwCJN54t57yANyV6RcBW8FF8PBSOwuHe1QYvIbXrf0yVleR+XtvpD9q53l7cTJr2rPFuuRfm7c0cHKQ5zJNegjz7kE7ZsNEZZiXXFVPV3ZPYYFQjRqfR4yJ2Tcs354msHjiHt2Q7Mt/CHcNyHpjsyu+isMSTu3sjUbb0V4FVUZtqb6eRrlmCjP/jzi6gBseZZSkhhbdYTXdxrw+6Mg1h8ZPN183P188dS2rgjNcWITLbS1WKxtQBfpwpWCVZhQxxZ e8jtfnAc fmLsToyjE0R9u7H+0JQRTaUiCtHmlJkoUPeoiwKoGcQNxtDE9bF49VaV29tNF9dQOUdInAYpcsQ3+76o1agtykicYdZm7Toal1IkGftBtip2svHa77y8yjFfouYs6EqtwsU78gD36WSADhiLRqN3PAmFCU7XvekTOLi3LPCHlA6ThLA5PFs/Izv7ZgDREIPnuoEBh7G4y54m/VJKfXWoNzZMv/So5OW1Ib1gV6P+++F1Y4C/cDCFDkweo7+YbvwfxAcsm5rcFcjQ315hEVeqq0apP2n84H/UaYR8YmXI/b2eQW3LdB+oAbJFgS076uooOdcdjHAyUUDuTj0ktmr/bS0AwgGLUn0FK4Q6dTTJTFgkuk5PTSpQNIAFqQO4HJW3cCiA8Y6BypJdPjS0= 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: Arnd Bergmann cifs_root_data() is defined in cifs and called from early init code, but lacks a global prototype: fs/cifs/cifsroot.c:83:12: error: no previous prototype for 'cifs_root_data' Move the declaration from do_mounts.c into an appropriate header. Signed-off-by: Arnd Bergmann --- include/linux/mount.h | 2 ++ init/do_mounts.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/mount.h b/include/linux/mount.h index 1ea326c368f7..f381eb44b24c 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h @@ -124,4 +124,6 @@ extern int iterate_mounts(int (*)(struct vfsmount *, void *), void *, struct vfsmount *); extern void kern_unmount_array(struct vfsmount *mnt[], unsigned int num); +extern int cifs_root_data(char **dev, char **opts); + #endif /* _LINUX_MOUNT_H */ diff --git a/init/do_mounts.c b/init/do_mounts.c index 811e94daf0a8..83447c46ad6d 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -489,8 +489,6 @@ static int __init mount_nfs_root(void) #ifdef CONFIG_CIFS_ROOT -extern int cifs_root_data(char **dev, char **opts); - #define CIFSROOT_TIMEOUT_MIN 5 #define CIFSROOT_TIMEOUT_MAX 30 #define CIFSROOT_RETRY_MAX 5