Re: [PATCH 5/8] xfs: add DAX file operations support

Dave Chinner
2015-04-16T11:48:14Z

On Thu, Apr 16, 2015 at 12:33:26PM +0300, Boaz Harrosh wrote:
> On 03/24/2015 12:51 PM, Dave Chinner wrote:
> <>
> > diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> > index 94713c2..8017175 100644
> > --- a/fs/xfs/xfs_file.c
> > +++ b/fs/xfs/xfs_file.c
> > @@ -385,7 +385,11 @@ xfs_file_splice_read(
> >
> > trace_xfs_file_splice_read(ip, count, *ppos, ioflags);
> >
> > - ret = generic_file_splice_read(infilp, ppos, pipe, count, flags);
> > + /* for dax, we need to avoid the page cache */
> > + if (IS_DAX(VFS_I(ip)))
> > + ret = default_file_splice_read(infilp, ppos, pipe, count, flags);
> > + else
> > + ret = generic_file_splice_read(infilp, ppos, pipe, count, flags);
>
> Dave hi
>
> Linus has accepted this patch:
> [be64f884be] dax: unify ext2/4_{dax,}_file_operations
>
> Which adds the same exact if(IS_DAX)) to generic_file_splice_read for use
> by ext2/4. (It made things easier for both ext2/4)
>
> But also this code is just fine of course

I'll leave it like this for the moment - I've missed the 4.1 merge
window for this code so I'll fix it up when 4.1-rc1 is out and I can
merge it pretty much straight away for the 4.2 cycle....

Cheers,

Dave.
--
Dave Chinner
david@fromorbit.com