| Message ID | 165644768886.1045534.3177166462110135738.stgit@magnolia (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fstests: random fixes | expand |
On Tue, Jun 28, 2022 at 01:21:28PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > In Linux 5.19, the superblock verifier logging changed to elaborate on > what was wrong. Fix the xfs_repair filtering function to accomodate > this development. > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > --- > common/repair | 1 + > 1 file changed, 1 insertion(+) > > > diff --git a/common/repair b/common/repair > index 463ef9db..398e9904 100644 > --- a/common/repair > +++ b/common/repair > @@ -29,6 +29,7 @@ _filter_repair() > # for sb > /- agno = / && next; # remove each AG line (variable number) > s/(pointer to) (\d+)/\1 INO/; > +s/Superblock has bad magic number.*/bad magic number/; > # Changed inode output in 5.5.0 > s/sb root inode value /sb root inode /; > s/realtime bitmap inode value /realtime bitmap inode /; Didn't I already fix that in commit 4c76d0ba ("xfs/070: filter the bad sb magic number error")? Cheers, Dave.
On Wed, Jun 29, 2022 at 02:15:47PM +1000, Dave Chinner wrote: > On Tue, Jun 28, 2022 at 01:21:28PM -0700, Darrick J. Wong wrote: > > From: Darrick J. Wong <djwong@kernel.org> > > > > In Linux 5.19, the superblock verifier logging changed to elaborate on > > what was wrong. Fix the xfs_repair filtering function to accomodate > > this development. > > > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > > --- > > common/repair | 1 + > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/common/repair b/common/repair > > index 463ef9db..398e9904 100644 > > --- a/common/repair > > +++ b/common/repair > > @@ -29,6 +29,7 @@ _filter_repair() > > # for sb > > /- agno = / && next; # remove each AG line (variable number) > > s/(pointer to) (\d+)/\1 INO/; > > +s/Superblock has bad magic number.*/bad magic number/; > > # Changed inode output in 5.5.0 > > s/sb root inode value /sb root inode /; > > s/realtime bitmap inode value /realtime bitmap inode /; > > Didn't I already fix that in commit 4c76d0ba ("xfs/070: filter the > bad sb magic number error")? Yes, you've added a line as below: s/^Superblock has (bad magic number) 0x.*/\1/; which is equal to: s/Superblock has bad magic number.*/bad magic number/; So we need to fix it again. > > Cheers, > > Dave. > > -- > Dave Chinner > david@fromorbit.com >
On Wed, Jun 29, 2022 at 05:12:48PM +0800, Zorro Lang wrote: > On Wed, Jun 29, 2022 at 02:15:47PM +1000, Dave Chinner wrote: > > On Tue, Jun 28, 2022 at 01:21:28PM -0700, Darrick J. Wong wrote: > > > From: Darrick J. Wong <djwong@kernel.org> > > > > > > In Linux 5.19, the superblock verifier logging changed to elaborate on > > > what was wrong. Fix the xfs_repair filtering function to accomodate > > > this development. > > > > > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > > > --- > > > common/repair | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > > > > diff --git a/common/repair b/common/repair > > > index 463ef9db..398e9904 100644 > > > --- a/common/repair > > > +++ b/common/repair > > > @@ -29,6 +29,7 @@ _filter_repair() > > > # for sb > > > /- agno = / && next; # remove each AG line (variable number) > > > s/(pointer to) (\d+)/\1 INO/; > > > +s/Superblock has bad magic number.*/bad magic number/; > > > # Changed inode output in 5.5.0 > > > s/sb root inode value /sb root inode /; > > > s/realtime bitmap inode value /realtime bitmap inode /; > > > > Didn't I already fix that in commit 4c76d0ba ("xfs/070: filter the > > bad sb magic number error")? Ah whoops I guess we can drop this one then. > Yes, you've added a line as below: > s/^Superblock has (bad magic number) 0x.*/\1/; > which is equal to: > s/Superblock has bad magic number.*/bad magic number/; > So we need to fix it again. We .... do? --D > > > > > Cheers, > > > > Dave. > > > > -- > > Dave Chinner > > david@fromorbit.com > > >
On Wed, Jun 29, 2022 at 03:41:10PM -0700, Darrick J. Wong wrote: > On Wed, Jun 29, 2022 at 05:12:48PM +0800, Zorro Lang wrote: > > On Wed, Jun 29, 2022 at 02:15:47PM +1000, Dave Chinner wrote: > > > On Tue, Jun 28, 2022 at 01:21:28PM -0700, Darrick J. Wong wrote: > > > > From: Darrick J. Wong <djwong@kernel.org> > > > > > > > > In Linux 5.19, the superblock verifier logging changed to elaborate on > > > > what was wrong. Fix the xfs_repair filtering function to accomodate > > > > this development. > > > > > > > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > > > > --- > > > > common/repair | 1 + > > > > 1 file changed, 1 insertion(+) > > > > > > > > > > > > diff --git a/common/repair b/common/repair > > > > index 463ef9db..398e9904 100644 > > > > --- a/common/repair > > > > +++ b/common/repair > > > > @@ -29,6 +29,7 @@ _filter_repair() > > > > # for sb > > > > /- agno = / && next; # remove each AG line (variable number) > > > > s/(pointer to) (\d+)/\1 INO/; > > > > +s/Superblock has bad magic number.*/bad magic number/; > > > > # Changed inode output in 5.5.0 > > > > s/sb root inode value /sb root inode /; > > > > s/realtime bitmap inode value /realtime bitmap inode /; > > > > > > Didn't I already fix that in commit 4c76d0ba ("xfs/070: filter the > > > bad sb magic number error")? > > Ah whoops I guess we can drop this one then. > > > Yes, you've added a line as below: > > s/^Superblock has (bad magic number) 0x.*/\1/; > > which is equal to: > > s/Superblock has bad magic number.*/bad magic number/; > > So we need to fix it again. > > We .... do? Sorry, "don't" missed :-P > > --D > > > > > > > > > Cheers, > > > > > > Dave. > > > > > > -- > > > Dave Chinner > > > david@fromorbit.com > > > > > >
diff --git a/common/repair b/common/repair index 463ef9db..398e9904 100644 --- a/common/repair +++ b/common/repair @@ -29,6 +29,7 @@ _filter_repair() # for sb /- agno = / && next; # remove each AG line (variable number) s/(pointer to) (\d+)/\1 INO/; +s/Superblock has bad magic number.*/bad magic number/; # Changed inode output in 5.5.0 s/sb root inode value /sb root inode /; s/realtime bitmap inode value /realtime bitmap inode /;