On Thu, Nov 23, 2017 at 11:04:57AM +0200, Amir Goldstein wrote:
> On Tue, Nov 14, 2017 at 2:33 PM, Eryu Guan <eguan@xxxxxxxxxx> wrote:
> > util-linux commit ea848180dd34 ("libmount: add
> > mnt_context_get_excode()") since v2.30 changed the error message on
> > EUCLEAN and ESTALE again (and maybe other errno too):
> >
> > - mount: <device> on <mountpoint> failed: Structure needs cleaning
> > + mount: <mountpoint>: mount(2) system call failed: Structure needs cleaning.
> >
> > and it causes xfs/005, overlay/037 to fail (and probably xfs/333 too,
> > but it's always _notrun for now).
> >
> > So let's filter out the changing parts and keep the error message
> > simple.
> >
> > Signed-off-by: Eryu Guan <eguan@xxxxxxxxxx>
> > ---
> > common/filter | 23 +++++++++++++++++++++++
> > tests/overlay/037 | 4 ++--
> > tests/overlay/037.out | 4 ++--
> > tests/xfs/005 | 7 +------
> > tests/xfs/333 | 2 +-
> > tests/xfs/333.out | 2 +-
> > 6 files changed, 30 insertions(+), 12 deletions(-)
> >
> > diff --git a/common/filter b/common/filter
> > index 0cb458b0051f..d1bb94818e3d 100644
> > --- a/common/filter
> > +++ b/common/filter
> > @@ -390,6 +390,13 @@ _filter_fstrim()
> > egrep -o "[0-9]+ bytes" | $AWK_PROG '{print $1}'
> > }
> >
> > +# Remove the ending dot appended to mount error message, util-linux 2.30
> > +# starts to do so.
> > +_filter_ending_dot()
> > +{
> > + sed -e "s/\.$//"
> > +}
> > +
> > # Older mount output referred to "block device" when mounting RO devices
> > # It's gone in newer versions
> > _filter_ro_mount() {
> > @@ -397,6 +404,22 @@ _filter_ro_mount() {
> > -e "s/mount: cannot mount block device/mount: cannot mount/g"
> > }
> >
> > +# Filter a failed mount output, util-linux changed the message several times.
> > +#
> > +# prior to v2.21:
> > +# mount: Structure needs cleaning
>
> So the mentioned tests are currently also broken with util-linux < v2.21?
> Maybe mention this is commit message.
Yeah, I think so, just v2.21 is pretty old, the affected tests are
usually _notrun on such old distributions that ship util-linux < v2.21,
e.g. RHEL6, so no one noticed it. I'll mention it in commit log.
>
> > +# v2.21 to v2.29:
> > +# mount: mount <device> on <mountpoint> failed: Structure needs cleaning
> > +# v2.30 and later:
> > +# mount: <mountpoint>: mount(2) system call failed: Structure needs cleaning.
> > +#
>
> Please document filtered format.
OK.
Thanks,
Eryu
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
