[1/3] common: filter aiodio dmesg after fs/iomap.c to fs/iomap/ move
diff mbox series

Message ID 156394157450.1850719.464315342783936237.stgit@magnolia
State New
Headers show
Series
  • fstests: various fixes
Related show

Commit Message

Darrick J. Wong July 24, 2019, 4:12 a.m. UTC
From: Darrick J. Wong <darrick.wong@oracle.com>

Since the iomap code are moving to fs/iomap/ we have to add new entries
to the aiodio dmesg filter to reflect this.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 common/filter |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Dave Chinner July 24, 2019, 11:21 p.m. UTC | #1
On Tue, Jul 23, 2019 at 09:12:54PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> Since the iomap code are moving to fs/iomap/ we have to add new entries
> to the aiodio dmesg filter to reflect this.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>  common/filter |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> 
> diff --git a/common/filter b/common/filter
> index ed082d24..26fc2132 100644
> --- a/common/filter
> +++ b/common/filter
> @@ -555,6 +555,7 @@ _filter_aiodio_dmesg()
>  	local warn7="WARNING:.*fs/iomap\.c:.*iomap_dio_actor.*"
>  	local warn8="WARNING:.*fs/iomap\.c:.*iomap_dio_complete.*"

There's two different warnings that need capturing here.

>  	local warn9="WARNING:.*fs/direct-io\.c:.*dio_complete.*"
> +	local warn10="WARNING:.*fs/iomap/direct-io\.c:.*iomap_dio_actor.*"
>  	sed -e "s#$warn1#Intentional warnings in xfs_file_dio_aio_write#" \
>  	    -e "s#$warn2#Intentional warnings in xfs_file_dio_aio_read#" \
>  	    -e "s#$warn3#Intentional warnings in xfs_file_read_iter#" \
> @@ -563,7 +564,8 @@ _filter_aiodio_dmesg()
>  	    -e "s#$warn6#Intentional warnings in __xfs_get_blocks#" \
>  	    -e "s#$warn7#Intentional warnings in iomap_dio_actor#" \
>  	    -e "s#$warn8#Intentional warnings in iomap_dio_complete#" \
> -	    -e "s#$warn9#Intentional warnings in dio_complete#"
> +	    -e "s#$warn9#Intentional warnings in dio_complete#" \
> +	    -e "s#$warn10#Intentional warnings in iomap_dio_actor#"

Why not just change the regex in warn7/warn8 just to catch anything
under fs/iomap rather than explictly specifying fs/iomap.c?

Cheers,

Dave.
Darrick J. Wong July 25, 2019, 6:02 p.m. UTC | #2
On Thu, Jul 25, 2019 at 09:21:17AM +1000, Dave Chinner wrote:
> On Tue, Jul 23, 2019 at 09:12:54PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> > 
> > Since the iomap code are moving to fs/iomap/ we have to add new entries
> > to the aiodio dmesg filter to reflect this.
> > 
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> >  common/filter |    4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > 
> > diff --git a/common/filter b/common/filter
> > index ed082d24..26fc2132 100644
> > --- a/common/filter
> > +++ b/common/filter
> > @@ -555,6 +555,7 @@ _filter_aiodio_dmesg()
> >  	local warn7="WARNING:.*fs/iomap\.c:.*iomap_dio_actor.*"
> >  	local warn8="WARNING:.*fs/iomap\.c:.*iomap_dio_complete.*"
> 
> There's two different warnings that need capturing here.

DOH, missed that.

> >  	local warn9="WARNING:.*fs/direct-io\.c:.*dio_complete.*"
> > +	local warn10="WARNING:.*fs/iomap/direct-io\.c:.*iomap_dio_actor.*"
> >  	sed -e "s#$warn1#Intentional warnings in xfs_file_dio_aio_write#" \
> >  	    -e "s#$warn2#Intentional warnings in xfs_file_dio_aio_read#" \
> >  	    -e "s#$warn3#Intentional warnings in xfs_file_read_iter#" \
> > @@ -563,7 +564,8 @@ _filter_aiodio_dmesg()
> >  	    -e "s#$warn6#Intentional warnings in __xfs_get_blocks#" \
> >  	    -e "s#$warn7#Intentional warnings in iomap_dio_actor#" \
> >  	    -e "s#$warn8#Intentional warnings in iomap_dio_complete#" \
> > -	    -e "s#$warn9#Intentional warnings in dio_complete#"
> > +	    -e "s#$warn9#Intentional warnings in dio_complete#" \
> > +	    -e "s#$warn10#Intentional warnings in iomap_dio_actor#"
> 
> Why not just change the regex in warn7/warn8 just to catch anything
> under fs/iomap rather than explictly specifying fs/iomap.c?

Ok I'll do that.

--D

> Cheers,
> 
> Dave.
> -- 
> Dave Chinner
> david@fromorbit.com

Patch
diff mbox series

diff --git a/common/filter b/common/filter
index ed082d24..26fc2132 100644
--- a/common/filter
+++ b/common/filter
@@ -555,6 +555,7 @@  _filter_aiodio_dmesg()
 	local warn7="WARNING:.*fs/iomap\.c:.*iomap_dio_actor.*"
 	local warn8="WARNING:.*fs/iomap\.c:.*iomap_dio_complete.*"
 	local warn9="WARNING:.*fs/direct-io\.c:.*dio_complete.*"
+	local warn10="WARNING:.*fs/iomap/direct-io\.c:.*iomap_dio_actor.*"
 	sed -e "s#$warn1#Intentional warnings in xfs_file_dio_aio_write#" \
 	    -e "s#$warn2#Intentional warnings in xfs_file_dio_aio_read#" \
 	    -e "s#$warn3#Intentional warnings in xfs_file_read_iter#" \
@@ -563,7 +564,8 @@  _filter_aiodio_dmesg()
 	    -e "s#$warn6#Intentional warnings in __xfs_get_blocks#" \
 	    -e "s#$warn7#Intentional warnings in iomap_dio_actor#" \
 	    -e "s#$warn8#Intentional warnings in iomap_dio_complete#" \
-	    -e "s#$warn9#Intentional warnings in dio_complete#"
+	    -e "s#$warn9#Intentional warnings in dio_complete#" \
+	    -e "s#$warn10#Intentional warnings in iomap_dio_actor#"
 }
 
 # We generate assert related WARNINGs on purpose and make sure test doesn't fail