On Mon 26-02-18 20:20:42, Dan Williams wrote:
In preparation for fixing the broken definition of S_DAX in the CONFIG_FS_DAX=n + CONFIG_DEV_DAX=y case, convert all IS_DAX() usages to use explicit tests for the DEVDAX and FSDAX sub-cases of DAX functionality.
Cc: Jan Kara jack@suse.com Cc: Matthew Wilcox mawilcox@microsoft.com Cc: Ross Zwisler ross.zwisler@linux.intel.com Cc: stable@vger.kernel.org Fixes: dee410792419 ("/dev/dax, core: file operations and dax-mmap") Signed-off-by: Dan Williams dan.j.williams@intel.com
Just one nit below. With that fixed you can add:
Reviewed-by: Jan Kara jack@suse.cz
@@ -3208,21 +3208,19 @@ static inline bool io_is_direct(struct file *filp) static inline bool vma_is_dax(struct vm_area_struct *vma) {
- return vma->vm_file && IS_DAX(vma->vm_file->f_mapping->host);
- struct inode *inode;
- if (!vma->vm_file)
return false;- inode = vma->vm_file->f_mapping->host;
When changing this, use file_inode() here as well?
Honza