From patchwork Mon Nov 28 21:12:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9450451 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D101160235 for ; Mon, 28 Nov 2016 21:14:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C31A027F9E for ; Mon, 28 Nov 2016 21:14:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B5B9427FE4; Mon, 28 Nov 2016 21:14:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4BE0C27F9E for ; Mon, 28 Nov 2016 21:14:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932469AbcK1VOF (ORCPT ); Mon, 28 Nov 2016 16:14:05 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:56661 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932188AbcK1VOB (ORCPT ); Mon, 28 Nov 2016 16:14:01 -0500 Received: from wuerfel.lan ([78.43.21.235]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0MPa4X-1c7KN834s5-004g4T; Mon, 28 Nov 2016 22:13:07 +0100 From: Arnd Bergmann To: Theodore Ts'o Cc: Ross Zwisler , Arnd Bergmann , Alexander Viro , Matthew Wilcox , Jan Kara , Andrew Morton , Dave Chinner , Dan Williams , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] dax: try to avoid unused function warnings Date: Mon, 28 Nov 2016 22:12:17 +0100 Message-Id: <20161128211233.2446605-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 MIME-Version: 1.0 X-Provags-ID: V03:K0:H4uXVa19Jksnr8F8BDYquS5msZYySIE+X4h3QozSpl4380qqMkE KpubSjdcbcKtwpEaWgCQPoqP4hx+o5b+CI0BNhfgH1oHdtpr2rWV7iRUZd9qbJnw6gbXD+Z DdpBu+VyJ+lhrgT6kjAf90/AREs39ET7XUEKWIJDWdiMjd4p41us6ZWiQOyeQFecYV1cnIN LRtc5KT5KXuCmGbMxG0vw== X-UI-Out-Filterresults: notjunk:1; V01:K0:xiUVmkg5JFQ=:CaVVVCRuF0Rfvk4LglDP7t moFrQ/6R3+wvaYRaMgRTbljRnjZfYUjWUn4fYVuE9BCxPa22vvOH84WXLDLfQG2mAzGg3C/mS 8aLpQ7XyS90/BKAlByHlZSKg9mzwn3Jr3Kob77SvleoR4BtdEBXRnKy97H2bDcpoaAmUB+Uil WOfHyImsiWTlMo/oGZmLjlsbUGYonm2ijvWA2vC7LUAOMP+GkwdZ5UisxGHscnzaghia98m/X xnbbbptBddstAhbbxh8NneOqx1wl4zZddiNG1zlno2Lybdc2CSa88JaIZcR+fDAWR04NyBMrU jUuyYcFxjXx89a1DB6A7qalb4OjWP8BKfLEqNUQVBc754AdweCrX4dfR0RrjsTvy23kJ032SQ MSAMvWxi21a/238032CF6pgPykhRCj9XnCDr6sLky2MIx7r97ZeGsNrhTBN75sxuQwxCgCu4V Mi0XcFf1JAqYVA6GYsxzlx52xzsbdFS2kAWo4GJEoaDr7HL2ye83gwZbOcPdx8grxVYUCb/ou R6P6TTTFyNlEAMIJsNEYBELfPvF9JHFIl+MKoeQc/LBBNaQEvp99/FjE2oN0MgotB7OyZH/ae PYMeGAR6FmKmbycdfFNCDGPAuDr9M6isrYwBkwwZBcAdFyCExDoO83Sa4MHXffCZXtfRChPnB 5607HpvfqzG1VfhxLBa62McgEiafh4OvupWP9jba4rGu3w9P/qK8LP8VE9XjRKR2IC1nUWadw dj8o35RrKkce4Fsk Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Without the get_block based I/O, we get warnings when CONFIG_FS_IOMAP is disabled: fs/dax.c:736:12: error: ‘dax_insert_mapping’ defined but not used [-Werror=unused-function] fs/dax.c:512:12: error: ‘copy_user_dax’ defined but not used [-Werror=unused-function] fs/dax.c:490:12: error: ‘dax_load_hole’ defined but not used [-Werror=unused-function] fs/dax.c:294:14: error: ‘grab_mapping_entry’ defined but not used [-Werror=unused-function] This patch blindly marks those as __maybe_unused, which avoids the warnings. However, I suspect that there is actually more code in this file that should not be provided without CONFIG_FS_IOMAP even though we don't get a warning for it, and that we actually want a different rework, so please treat this as a bug report. I have applied the patch locally in my randconfig build setup to avoid seeing the warnings. Fixes: 5ac65736f740 ("dax: rip out get_block based IO support") Signed-off-by: Arnd Bergmann --- fs/dax.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index b1fe228cd609..cf844e77b7b7 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -309,7 +309,7 @@ static void put_unlocked_mapping_entry(struct address_space *mapping, * persistent memory the benefit is doubtful. We can add that later if we can * show it helps. */ -static void *grab_mapping_entry(struct address_space *mapping, pgoff_t index, +static __maybe_unused void * grab_mapping_entry(struct address_space *mapping, pgoff_t index, unsigned long size_flag) { bool pmd_downgrade = false; /* splitting 2MiB entry into 4k entries? */ @@ -489,7 +489,7 @@ int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index) * otherwise it will simply fall out of the page cache under memory * pressure without ever having been dirtied. */ -static int dax_load_hole(struct address_space *mapping, void *entry, +static int __maybe_unused dax_load_hole(struct address_space *mapping, void *entry, struct vm_fault *vmf) { struct page *page; @@ -509,7 +509,7 @@ static int dax_load_hole(struct address_space *mapping, void *entry, return VM_FAULT_LOCKED; } -static int copy_user_dax(struct block_device *bdev, sector_t sector, size_t size, +static int __maybe_unused copy_user_dax(struct block_device *bdev, sector_t sector, size_t size, struct page *to, unsigned long vaddr) { struct blk_dax_ctl dax = { @@ -815,7 +815,7 @@ int dax_writeback_mapping_range(struct address_space *mapping, } EXPORT_SYMBOL_GPL(dax_writeback_mapping_range); -static int dax_insert_mapping(struct address_space *mapping, +static int __maybe_unused dax_insert_mapping(struct address_space *mapping, struct block_device *bdev, sector_t sector, size_t size, void **entryp, struct vm_area_struct *vma, struct vm_fault *vmf) {