On Mon 26-02-18 20:20:21, Dan Williams wrote: > In preparation for fixing S_DAX to be defined in the CONFIG_FS_DAX=n + > CONFIG_DEV_DAX=y case, move the definition of these routines outside of > the "#ifdef CONFIG_FS_DAX" guard. This is also a coding-style fix to > move all ifdef handling to header files rather than in the source. The > compiler will still be able to determine that all the related code can > be discarded in the CONFIG_FS_DAX=n case. > > Cc: Jan Kara <[email protected]> > Cc: <[email protected]> > Fixes: dee410792419 ("/dev/dax, core: file operations and dax-mmap") > Signed-off-by: Dan Williams <[email protected]>
Looks good. You can add: Reviewed-by: Jan Kara <[email protected]> Honza > --- > fs/ext4/file.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/fs/ext4/file.c b/fs/ext4/file.c > index fb6f023622fe..51854e7608f0 100644 > --- a/fs/ext4/file.c > +++ b/fs/ext4/file.c > @@ -34,7 +34,6 @@ > #include "xattr.h" > #include "acl.h" > > -#ifdef CONFIG_FS_DAX > static ssize_t ext4_dax_read_iter(struct kiocb *iocb, struct iov_iter *to) > { > struct inode *inode = file_inode(iocb->ki_filp); > @@ -60,7 +59,6 @@ static ssize_t ext4_dax_read_iter(struct kiocb *iocb, > struct iov_iter *to) > file_accessed(iocb->ki_filp); > return ret; > } > -#endif > > static ssize_t ext4_file_read_iter(struct kiocb *iocb, struct iov_iter *to) > { > @@ -70,10 +68,8 @@ static ssize_t ext4_file_read_iter(struct kiocb *iocb, > struct iov_iter *to) > if (!iov_iter_count(to)) > return 0; /* skip atime */ > > -#ifdef CONFIG_FS_DAX > if (IS_DAX(file_inode(iocb->ki_filp))) > return ext4_dax_read_iter(iocb, to); > -#endif > return generic_file_read_iter(iocb, to); > } > > @@ -179,7 +175,6 @@ static ssize_t ext4_write_checks(struct kiocb *iocb, > struct iov_iter *from) > return iov_iter_count(from); > } > > -#ifdef CONFIG_FS_DAX > static ssize_t > ext4_dax_write_iter(struct kiocb *iocb, struct iov_iter *from) > { > @@ -208,7 +203,6 @@ ext4_dax_write_iter(struct kiocb *iocb, struct iov_iter > *from) > ret = generic_write_sync(iocb, ret); > return ret; > } > -#endif > > static ssize_t > ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from) > > -- Jan Kara <[email protected]> SUSE Labs, CR
