Commit 26f2f4de authored Sep 03, 2017 by Dan Williams

dax: fix FS_DAX=n BLOCK=y compilation



The 0day kbuild robot reports:

>> drivers//dax/super.c:64:20: error: redefinition of 'fs_dax_get_by_bdev'
    struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev)
                       ^~~~~~~~~~~~~~~~~~
   In file included from drivers//dax/super.c:22:0:
   include/linux/dax.h:76:34: note: previous definition of 'fs_dax_get_by_bdev' was here
    static inline struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev)
                                     ^~~~~~~~~~~~~~~~~~

Protect the definition of fs_dax_get_by_bdev() in drivers/dax/super.c
with an ifdef.

Fixes: 78f35473 ("dax: introduce a fs_dax_get_by_bdev() helper")
Cc: Christoph Hellwig <hch@lst.de>
Cc: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

parent 8f98ae0c

drivers/dax/super.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ int bdev_dax_pgoff(struct block_device *bdev, sector_t sector, size_t size,
		}
		EXPORT_SYMBOL(bdev_dax_pgoff);

		#if IS_ENABLED(CONFIG_FS_DAX)
		struct dax_device fs_dax_get_by_bdev(struct block_device bdev)
		{
		if (!blk_queue_dax(bdev->bd_queue))
		@@ -68,6 +69,7 @@ struct dax_device fs_dax_get_by_bdev(struct block_device bdev)
		return fs_dax_get_by_host(bdev->bd_disk->disk_name);
		}
		EXPORT_SYMBOL_GPL(fs_dax_get_by_bdev);
		#endif

		/**
		* __bdev_dax_supported() - Check if the device supports dax for filesystem