]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
dax: fix FS_DAX=n BLOCK=y compilation
authorDan Williams <dan.j.williams@intel.com>
Sun, 3 Sep 2017 17:17:53 +0000 (10:17 -0700)
committerDan Williams <dan.j.williams@intel.com>
Sun, 3 Sep 2017 17:17:53 +0000 (10:17 -0700)
commit26f2f4de0bd93cbe891e11307d9e4906253bfda8
treee9a497fb89f33ae8733dd5f517212e9fcfcb84b0
parent8f98ae0c9b90bb46097e4f28e81e9ae6148e5694
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: 78f354735081 ("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>
drivers/dax/super.c