On Mon, Aug 12, 2019 at 10:52:35PM +1000, Matthew Bobrowski wrote: > +#ifdef CONFIG_FS_ENCRYPTION > + if (IS_ENCRYPTED(inode)) > + return false; > +#endif This could use IS_ENABLED. > return -EIO; > > if (!iov_iter_count(to)) > return 0; /* skip atime */ > > #ifdef CONFIG_FS_DAX > - if (IS_DAX(file_inode(iocb->ki_filp))) > + if (IS_DAX(inode)) > return ext4_dax_read_iter(iocb, to); > #endif Same here.