From: Darrick J. Wong Date: Wed, 3 Aug 2022 04:22:29 +0000 (-0700) Subject: common/xfs: fix _reset_xfs_sysfs_error_handling reset to actual defaults X-Git-Tag: v2022.09.04~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f3c314574d011e4b8d5c6f605e0ec6fed9f3804c;p=xfstests-dev.git common/xfs: fix _reset_xfs_sysfs_error_handling reset to actual defaults There's a slight mistake in _reset_xfs_sysfs_error_handling: it sets retry_timeout_seconds to 0, which is not the current default (-1) in upstream Linux. Fix this. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Zorro Lang --- diff --git a/common/xfs b/common/xfs index f6f4cdd2..92c281c6 100644 --- a/common/xfs +++ b/common/xfs @@ -804,7 +804,7 @@ _reset_xfs_sysfs_error_handling() _get_fs_sysfs_attr $dev error/metadata/${e}/max_retries _set_fs_sysfs_attr $dev \ - error/metadata/${e}/retry_timeout_seconds 0 + error/metadata/${e}/retry_timeout_seconds -1 echo -n "error/metadata/${e}/retry_timeout_seconds=" _get_fs_sysfs_attr $dev \ error/metadata/${e}/retry_timeout_seconds diff --git a/tests/xfs/006.out b/tests/xfs/006.out index 3260b3a2..433b0bc3 100644 --- a/tests/xfs/006.out +++ b/tests/xfs/006.out @@ -1,8 +1,8 @@ QA output created by 006 error/fail_at_unmount=1 error/metadata/default/max_retries=-1 -error/metadata/default/retry_timeout_seconds=0 +error/metadata/default/retry_timeout_seconds=-1 error/metadata/EIO/max_retries=-1 -error/metadata/EIO/retry_timeout_seconds=0 +error/metadata/EIO/retry_timeout_seconds=-1 error/metadata/ENOSPC/max_retries=-1 -error/metadata/ENOSPC/retry_timeout_seconds=0 +error/metadata/ENOSPC/retry_timeout_seconds=-1 diff --git a/tests/xfs/264.out b/tests/xfs/264.out index 502e72d3..e45ac5a5 100644 --- a/tests/xfs/264.out +++ b/tests/xfs/264.out @@ -2,20 +2,20 @@ QA output created by 264 === Test EIO/max_retries === error/fail_at_unmount=1 error/metadata/default/max_retries=-1 -error/metadata/default/retry_timeout_seconds=0 +error/metadata/default/retry_timeout_seconds=-1 error/metadata/EIO/max_retries=-1 -error/metadata/EIO/retry_timeout_seconds=0 +error/metadata/EIO/retry_timeout_seconds=-1 error/metadata/ENOSPC/max_retries=-1 -error/metadata/ENOSPC/retry_timeout_seconds=0 +error/metadata/ENOSPC/retry_timeout_seconds=-1 error/fail_at_unmount=0 error/metadata/EIO/max_retries=1 === Test EIO/retry_timeout_seconds === error/fail_at_unmount=1 error/metadata/default/max_retries=-1 -error/metadata/default/retry_timeout_seconds=0 +error/metadata/default/retry_timeout_seconds=-1 error/metadata/EIO/max_retries=-1 -error/metadata/EIO/retry_timeout_seconds=0 +error/metadata/EIO/retry_timeout_seconds=-1 error/metadata/ENOSPC/max_retries=-1 -error/metadata/ENOSPC/retry_timeout_seconds=0 +error/metadata/ENOSPC/retry_timeout_seconds=-1 error/fail_at_unmount=0 error/metadata/EIO/retry_timeout_seconds=1