diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-21 22:33:04 +0300 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-21 22:33:04 +0300 |
| commit | 36092ee8ba695fce023b2118ececa6c2a56b1331 (patch) | |
| tree | b9579893cdd559e7b72fa569003b19792de58fad /include/linux | |
| parent | 1b982baf75e7d9585967fcfccd05b77bf9054010 (diff) | |
| parent | 03dca343afe080968d90c4d9196404b5bbbc8461 (diff) | |
| download | linux-36092ee8ba695fce023b2118ececa6c2a56b1331.tar.xz | |
Merge branch 'for-4.7/dax' into libnvdimm-for-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 70e61b58baaf..8363a10660f6 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2320,14 +2320,6 @@ extern struct super_block *freeze_bdev(struct block_device *); extern void emergency_thaw_all(void); extern int thaw_bdev(struct block_device *bdev, struct super_block *sb); extern int fsync_bdev(struct block_device *); -#ifdef CONFIG_FS_DAX -extern bool blkdev_dax_capable(struct block_device *bdev); -#else -static inline bool blkdev_dax_capable(struct block_device *bdev) -{ - return false; -} -#endif extern struct super_block *blockdev_superblock; |