xfs: remove dax code from object file when disabled
authorArnd Bergmann <arnd@arndb.de>
Thu, 21 Jul 2016 23:50:55 +0000 (09:50 +1000)
committerDave Chinner <david@fromorbit.com>
Thu, 21 Jul 2016 23:50:55 +0000 (09:50 +1000)
commitf021bd071f06b545926b1031348873b05442139f
treebb6d3a60a3c9bcfcb1c8c5f63d63847b065b418e
parent99579ccec4e271c3d4d4e7c946058766812afdab
xfs: remove dax code from object file when disabled

We check IS_DAX(inode) before calling either xfs_file_dax_read or
xfs_file_dax_write, and this will lead the call being optimized out at
compile time when CONFIG_FS_DAX is disabled.

However, the two functions are marked STATIC, so they become global
symbols when CONFIG_XFS_DEBUG is set, leaving us with two unused global
functions that call into an undefined function and a broken "allmodconfig"
build:

fs/built-in.o: In function `xfs_file_dax_read':
fs/xfs/xfs_file.c:348: undefined reference to `dax_do_io'
fs/built-in.o: In function `xfs_file_dax_write':
fs/xfs/xfs_file.c:758: undefined reference to `dax_do_io'

Marking the two functions 'static noinline' instead of 'STATIC' will let
the compiler drop the symbols when there are no callers but avoid the
implicit inlining.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 16d4d43595b4 ("xfs: split direct I/O and DAX path")
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
fs/xfs/xfs_file.c