On Wed, Aug 03, 2016 at 09:23:05AM +1000, Dave Chinner wrote:
> On Mon, Aug 01, 2016 at 11:02:56AM +0200, Christoph Hellwig wrote:
> > The recent direct I/O path refactor changed the function name in the
> > racing read case. Update the test case to handle the new name in
> > addition to the old one.
> >
> > Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> > ---
> > tests/generic/095 | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/tests/generic/095 b/tests/generic/095
> > index c656ef1..4754992 100755
> > --- a/tests/generic/095
> > +++ b/tests/generic/095
> > @@ -125,9 +125,11 @@ $FIO_PROG $fio_config >>$seqres.full 2>&1
> > filter_xfs_dmesg()
> > {
> > local warn1="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_dio_aio_write.*"
> > - local warn2="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_read_iter.*"
> > + local warn2="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_dio_aio_read.*"
> > + local warn3="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_read_iter.*"
> > sed -e "s#$warn1#Intentional warnings in xfs_file_dio_aio_write#" \
> > - -e "s#$warn2#Intentional warnings in xfs_file_read_iter#"
> > + -e "s#$warn2#Intentional warnings in xfs_file_dio_aio_read#" \
> > + -e "s#$warn3#Intentional warnings in xfs_file_read_iter#"
Hi,
1) xfs_file_dio_aio_read() was splited from xfs_file_read_iter() by
below commit:
bbc5a74 xfs: split xfs_file_read_iter into buffered and direct I/O helpers
2) xfs_file_read_iter() came from xfs_file_aio_read() as below commit:
b4f5d2c xfs: switch to ->read_iter()
Some Linux distro (e.g: RHEL-7) still use the old kernel with old function
xfs_file_aio_read(), generic/095 always fails on it. So how about filter
xfs_file_aio_read too?
Thanks,
Zorro
> > }
>
> Looks fine.
>
> Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>
>
> --
> Dave Chinner
> david@xxxxxxxxxxxxx
>
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
