diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-19 17:35:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-19 17:35:34 -0700 |
| commit | 8c3fc1643d13ff70110701d08beaf77dc20c7c0a (patch) | |
| tree | 23f9688fe2ddcff44fb46fc9d84bac37e91e1e9a /drivers | |
| parent | 0bdc6fd2329e51b9659d5192f4281493c15e95b3 (diff) | |
| parent | f5705aa8cfed142d980ecac12bee0d81b756479e (diff) | |
| download | linux-8c3fc1643d13ff70110701d08beaf77dc20c7c0a.tar.bz2 | |
Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fixes from Dan Williams:
"A couple of compile fixes.
With the removal of the ->direct_access() method from
block_device_operations in favor of a new dax_device + dax_operations
we broke two configurations.
The CONFIG_BLOCK=n case is fixed by compiling out the block+dax
helpers in the dax core. Configurations with FS_DAX=n EXT4=y / XFS=y
and DAX=m fail due to the helpers the builtin filesystem needs being
in a module, so we stub out the helpers in the FS_DAX=n case."
* 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
dax, xfs, ext4: compile out iomap-dax paths in the FS_DAX=n case
dax: fix false CONFIG_BLOCK dependency
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dax/super.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 |