summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarrick J. Wong <djwong@kernel.org>2022-08-02 21:22:29 -0700
committerZorro Lang <zlang@kernel.org>2022-09-04 21:44:05 +0800
commitf3c314574d011e4b8d5c6f605e0ec6fed9f3804c (patch)
treeb5cd87927d619db60faf5966ea0279f377af44a8
parente42fa9fec80271d36a6b87c0de54b87e2e0717fa (diff)
downloadxfstests-f3c314574d011e4b8d5c6f605e0ec6fed9f3804c.tar.zst
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 <djwong@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Zorro Lang <zlang@kernel.org>
-rw-r--r--common/xfs2
-rw-r--r--tests/xfs/006.out6
-rw-r--r--tests/xfs/264.out12
3 files changed, 10 insertions, 10 deletions
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