Merge tag 'libnvdimm-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...

[linux-2.6-block.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 731262c3fbb7b12952811981580961284500e7a3..eb73d74ed99262c83f2fa5e51582b2da0344bafa 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -483,6 +483,9 @@ struct block_device {
        int                     bd_fsfreeze_count;
        /* Mutex for freeze */
        struct mutex            bd_fsfreeze_mutex;
+#ifdef CONFIG_FS_DAX
+       int                     bd_map_count;
+#endif
 };
 
 /*
@@ -2280,6 +2283,14 @@ 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;