| Message ID | 20230131124005.14207-2-jack@suse.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fstests: Fix checking of UDF filesystems | expand |
On Tue, Jan 31, 2023 at 01:39:58PM +0100, Jan Kara wrote: > _check_udf_filesystem forgot to unmount the filesystem prior to checking > it. That was leading to check failures. > > Signed-off-by: Jan Kara <jack@suse.cz> > --- Looks good to me, Reviewed-by: Zorro Lang <zlang@redhat.com> > common/rc | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/common/rc b/common/rc > index bf3effa4c1ed..7f80afe7aeec 100644 > --- a/common/rc > +++ b/common/rc > @@ -3074,6 +3074,12 @@ _check_udf_filesystem() > return > fi > > + # Is the filesystem mounted? > + local type=`_fs_type $device` > + if [ "$type" = "$FSTYP" ]; then > + local mountpoint=`_umount_or_remount_ro $device` > + fi > + > local device=$1 > local blksz=`echo $MKFS_OPTIONS | sed -rn 's/.*(-b|--blocksize)[ =]?+([0-9]+).*/\2/p'` > if [ -z "$blksz" ]; then > @@ -3090,6 +3096,10 @@ _check_udf_filesystem() > _udf_test_known_error_filter | \ > grep -E -iv "Error count:.*[0-9]+.*total occurrences:.*[0-9]+|Warning count:.*[0-9]+.*total occurrences:.*[0-9]+" && \ > echo "Warning UDF Verifier reported errors see $seqres.checkfs." && return 1 > + # Remount the filesystem > + if [ "$type" = "$FSTYP" ]; then > + _mount_or_remount_rw "$MOUNT_OPTIONS" $device $mountpoint > + fi > return 0 > } > > -- > 2.35.3 >
diff --git a/common/rc b/common/rc index bf3effa4c1ed..7f80afe7aeec 100644 --- a/common/rc +++ b/common/rc @@ -3074,6 +3074,12 @@ _check_udf_filesystem() return fi + # Is the filesystem mounted? + local type=`_fs_type $device` + if [ "$type" = "$FSTYP" ]; then + local mountpoint=`_umount_or_remount_ro $device` + fi + local device=$1 local blksz=`echo $MKFS_OPTIONS | sed -rn 's/.*(-b|--blocksize)[ =]?+([0-9]+).*/\2/p'` if [ -z "$blksz" ]; then @@ -3090,6 +3096,10 @@ _check_udf_filesystem() _udf_test_known_error_filter | \ grep -E -iv "Error count:.*[0-9]+.*total occurrences:.*[0-9]+|Warning count:.*[0-9]+.*total occurrences:.*[0-9]+" && \ echo "Warning UDF Verifier reported errors see $seqres.checkfs." && return 1 + # Remount the filesystem + if [ "$type" = "$FSTYP" ]; then + _mount_or_remount_rw "$MOUNT_OPTIONS" $device $mountpoint + fi return 0 }
_check_udf_filesystem forgot to unmount the filesystem prior to checking it. That was leading to check failures. Signed-off-by: Jan Kara <jack@suse.cz> --- common/rc | 10 ++++++++++ 1 file changed, 10 insertions(+)