diff options
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 1a2046275cdf..ae681002100a 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -484,9 +484,6 @@ struct block_device { | |||
484 | int bd_fsfreeze_count; | 484 | int bd_fsfreeze_count; |
485 | /* Mutex for freeze */ | 485 | /* Mutex for freeze */ |
486 | struct mutex bd_fsfreeze_mutex; | 486 | struct mutex bd_fsfreeze_mutex; |
487 | #ifdef CONFIG_FS_DAX | ||
488 | int bd_map_count; | ||
489 | #endif | ||
490 | }; | 487 | }; |
491 | 488 | ||
492 | /* | 489 | /* |
@@ -2907,7 +2904,7 @@ extern void replace_mount_options(struct super_block *sb, char *options); | |||
2907 | 2904 | ||
2908 | static inline bool io_is_direct(struct file *filp) | 2905 | static inline bool io_is_direct(struct file *filp) |
2909 | { | 2906 | { |
2910 | return (filp->f_flags & O_DIRECT) || IS_DAX(file_inode(filp)); | 2907 | return (filp->f_flags & O_DIRECT) || IS_DAX(filp->f_mapping->host); |
2911 | } | 2908 | } |
2912 | 2909 | ||
2913 | static inline int iocb_flags(struct file *file) | 2910 | static inline int iocb_flags(struct file *file) |