From 4515048910312573d8989ba64ee5cac76138e8f8 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Wed, 13 Dec 2017 15:28:05 -0800 Subject: [PATCH] xfs/068: fix clonerange problems in file/dir count output In this test we use a fixed sequence of operations in fsstress to create some number of files and dirs and then exercise xfsdump/xfsrestore on them. Since clonerange/deduperange are not supported on all xfs configurations, detect if they're in fsstress and disable them so that we always execute exactly the same sequence of operations no matter how the filesystem is configured. [eguan: move it from xfs/068 to common/dump as Dave suggested] Signed-off-by: Darrick J. Wong Suggested-by: Dave Chinner Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- common/dump | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/common/dump b/common/dump index 898aaa40..2b3cfa0f 100644 --- a/common/dump +++ b/common/dump @@ -312,6 +312,17 @@ _create_dumpdir_stress_num() status=1 exit fi + + # Remove fsstress commands that aren't supported on all xfs configs so that + # we always execute exactly the same sequence of operations no matter how + # the filesystem is configured + if $FSSTRESS_PROG | grep -q clonerange; then + FSSTRESS_AVOID="-f clonerange=0 $FSSTRESS_AVOID" + fi + if $FSSTRESS_PROG | grep -q deduperange; then + FSSTRESS_AVOID="-f deduperange=0 $FSSTRESS_AVOID" + fi + echo "" echo "-----------------------------------------------" echo "fsstress : $_param" -- 2.47.3