From patchwork Mon May 15 13:44:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 99813 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1554589qge; Mon, 15 May 2017 06:46:55 -0700 (PDT) X-Received: by 10.84.202.12 with SMTP id w12mr8685925pld.55.1494856015029; Mon, 15 May 2017 06:46:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494856015; cv=none; d=google.com; s=arc-20160816; b=rM8rDQ5DsVhf0cRGeipRewwc/35GmRtMkfXFvRn29WGp1EaVXiiZX6iPc6mfc+tlr2 cO7NscqhsOjVG2HMpbvr3Mqd2tCZygxOy3R4NnsSXoXfPH0CG+8pPebpSCTxNuJh5aen OuAlYYYnHHuHDPg4JIdUCY9nngi6ZL+fMswa76DLXX3l98Ro6iQCO1RlLobhqdMLa5EC 85ioOcDUYqT61RGFGnKsBUzzSqWL6n7SDD45FW6cenr63BwoUvQVOSl7Ps8HJkzfn292 vyhtvlebs6tRU61sfi/NeLJYeeGUN5QdJo/1TkFd/qQUdp5lbdZhPzwnx9RBQj4WMCBM MJYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=nK/y4Jwp6XdPK1UTl3Q0XpELM2+E3wVhlDOP6t9ZYAE=; b=HWP5IwhXWNhEqhftSy8XyTob4Mrzq4fv2cSh8uHPF38KK+vRl8/Q1jZOct8D7j8nH6 k4O4uObdHlHeSwFD7fQusUHeBpeR/8eQLlo1wA1lQR2FrNC4TJ+MIyKuqfA08sAfDXvZ 7RUDFdIRU76RI3oC2B7CPZ46YeZx6eHtfdbk9NnpT3iuJrQ4rE6LXcVS1/povjsLgo4/ onEilnJkUTpIWMphgWjl2jrvSLmX7BCwWLt3LYLtINFBR+VpPE6UtvO6jtxZ5rIsYAOd mM89XM8iYdVqQdURKzmagmpC/+oSppDZHmC2t8HATibLgtRfUM4/Ig4LYyOwJgdn9q7o EqVQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m63si10311306pld.109.2017.05.15.06.46.54; Mon, 15 May 2017 06:46:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964897AbdEONqq (ORCPT + 25 others); Mon, 15 May 2017 09:46:46 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:60694 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933582AbdEONqo (ORCPT ); Mon, 15 May 2017 09:46:44 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0MVYtf-1dVT7B3Q4t-00Z2Yf; Mon, 15 May 2017 15:45:26 +0200 From: Arnd Bergmann To: Dan Williams Cc: Jan Kara , Geert Uytterhoeven , linux-xfs@vger.kernel.org, "Darrick J . Wong" , Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] dax: hide block device code in #ifdef Date: Mon, 15 May 2017 15:44:00 +0200 Message-Id: <20170515134508.2713243-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:H4zknGhZlMUyz5IMg3/PBT9uWzq3CVMNhNnL9Z9xcnZi3FjWt0/ n6igmkBxDsBD4XpHLwO7dGDijz/CTdQNtbGkhplpz9VFB/aJbtf+HE/xei/QKPKc9sdDvAL ASTXqgjoNxVYGdlPCujavWob7jKJL5bXWFxaXKnb4Swo5jJXKDpMYTXKPCMgyf0wSNjTChf 1KP9sEwVsA8Z4Jtr4mLgQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:pvfv6cYJxMg=:nbYHn7A36QEIgMhddXUCfZ Bfn/gxAmJEtcy8GukkNsmoAgDFv0QJX0gZARw9ZCcPRiEuZCiPAryw31KuPgKHwcqQUyUzKno c9+Fu03CeCdKVQHGmRcTuMzqwvrz3u6FK4iS7GOl5kfan0r97Ktmr6vjyt0V0wgjVGGcHtP5b 5sf5rgktXMK0Ldc4AJKVsCseaS0cJJRVS9+HyzD8GNgsPu674nzhjOaB8yCPeCOhQ03YR0Jp7 FYB/bF3bo35ivYKSMOxr+ii+JckyC6f9nvSXQMHG+du5EvcwFHltTKSv0ZEVo7aa+gslM1MeH s0mzejS2zrdtj2I8eRjvPoYZUGouf2gavQSiUNhUT5vtFOUc/cLaRyzi/IdadvtReivcMp/Xl Vmqr7ovXny96hLdDHJ1Q+mIFXUVrK78TVqAoLnlP6jFHWdokrmt0pN3zl6Gh6NJwvyQKLoq1/ fAyKIpy677gQ5uyIR13AQKbm3bEUWMumWrVqQD9TlG9jnwks0xr+1fTMnEQoNuDaLAsnZMmpO 4XG8X3TxbYAHloob9VArafF1Pef+yaFyUiSeSnFn/ncoIzkS9pCCvV+8wBhdLcEgvddyarVPO CES3XZ0D9FsGI084octpyXs15v/CCr01rGZdlNlE2PHbj1JemBR3Ijel7biocb3EuID4oZAP/ N56Y2BuA7pl3xL0Iz7/HHFk4abMd+nFF0Q9LNnZaWO8XtnRQvq6IKDFmryorFHgIISDM= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We allow configurations with CONFIG_BLOCK=n and CONFIG_DAX=y, which now results in a link error: drivers/dax/super.c: In function 'bdev_dax_pgoff': drivers/dax/super.c:50:26: error: implicit declaration of function 'get_start_sect'; did you mean 'get_task_cred'? [-Werror=implicit-function-declaration] The two obvious ways to avoid the link error are to either add an #ifdef around the code that was moved from fs/block_dev.c, or to disallow the configuration. I could not see if there is or is not a reason to support this combination of options, but in case there is, the #ifdef is the safer choice. Fixes: ef51042472f5 ("block, dax: move "select DAX" from BLOCK to FS_DAX") Signed-off-by: Arnd Bergmann --- drivers/dax/super.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0 Reviewed-by: Darrick J. Wong diff --git a/drivers/dax/super.c b/drivers/dax/super.c index ebf43f531ada..6ed32aac8bbe 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -44,6 +44,7 @@ void dax_read_unlock(int id) } EXPORT_SYMBOL_GPL(dax_read_unlock); +#ifdef CONFIG_BLOCK int bdev_dax_pgoff(struct block_device *bdev, sector_t sector, size_t size, pgoff_t *pgoff) { @@ -112,6 +113,7 @@ int __bdev_dax_supported(struct super_block *sb, int blocksize) return 0; } EXPORT_SYMBOL_GPL(__bdev_dax_supported); +#endif /** * struct dax_device - anchor object for dax services