reflink: change to relative margins

NFS uses 32K blocks and thus the numbers used for sanity checking
various reflink operations are way off.  Change to relative margings
and increase them a bit to make NFS happy.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/tests/generic/150 b/tests/generic/150
index f3a63114d17a3a07cf19fbb4e64c7b5b650e7ad5..90ac46b7cb459b45c43d6c2560d36e49d41cb597 100755 (executable)
--- a/tests/generic/150
+++ b/tests/generic/150
@@ -57,7 +57,7 @@ mkdir "$testdir"
 echo "Create the original file blocks"
 blksz="$(stat -f $testdir -c '%S')"
 blks=2000
-margin=100
+margin='15%'
 sz=$((blksz * blks))
 nr=7
 _pwrite_byte 0x61 0 $sz "$testdir/file1" >> "$seqres.full"

diff --git a/tests/generic/151 b/tests/generic/151
index 286b9ec7e4057e7e9d1726363b831f7bac34bc59..c67a12cd2b8892462078e02e09a406d4caafb093 100755 (executable)
--- a/tests/generic/151
+++ b/tests/generic/151
@@ -61,7 +61,7 @@ mkdir "$testdir"
 echo "Create the original file blocks"
 blksz="$(stat -f "$testdir" -c '%S')"
 blks=2000
-margin=100
+margin='15%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f "$testdir" -c '%f')
 nr=7

diff --git a/tests/generic/152 b/tests/generic/152
index 506a7544bd7ee49efe148db0c05f376c601e4177..cdb2bf983db1ade8c002e0ceac11583e940ea43b 100755 (executable)
--- a/tests/generic/152
+++ b/tests/generic/152
@@ -62,7 +62,7 @@ mkdir "$testdir"
 echo "Create the original file blocks"
 blksz="$(stat -f "$testdir" -c '%S')"
 blks=2000
-margin=100
+margin='15%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f "$testdir" -c '%f')
 nr=4

diff --git a/tests/generic/153 b/tests/generic/153
index 011879e99f641a608db089d2b817166547d6c17c..b2f4022f4923a068b2ce7689c3bbac464ff5ae87 100755 (executable)
--- a/tests/generic/153
+++ b/tests/generic/153
@@ -62,7 +62,7 @@ mkdir "$testdir"
 echo "Create the original file blocks"
 blksz="$(stat -f "$testdir" -c '%S')"
 blks=2000
-margin=100
+margin='15%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f "$testdir" -c '%f')
 nr=4

diff --git a/tests/generic/154 b/tests/generic/154
index 474c578b58f3b6661d06499fdfa94a8d21657d2b..579f78bfe9a6b446a03f0cf9b39c845be1e1c797 100755 (executable)
--- a/tests/generic/154
+++ b/tests/generic/154
@@ -61,7 +61,7 @@ mkdir "$testdir"
 echo "Create the original file blocks"
 blksz="$(stat -f "$testdir" -c '%S')"
 blks=2000
-margin=100
+margin='15%'
 free_blocks0=$(stat -f "$testdir" -c '%f')
 nr=4
 sz=$((blks * blksz))

diff --git a/tests/generic/155 b/tests/generic/155
index 611cf1abf8d6aa16fa4a67e65a0605eb5b0b6ffa..56d2912869c6b7f7bf1ecfaaa0204cd85f874b4d 100755 (executable)
--- a/tests/generic/155
+++ b/tests/generic/155
@@ -65,7 +65,7 @@ mkdir $testdir
 echo "Create the original file blocks"
 blksz="$(stat -f "$testdir" -c '%S')"
 blks=2000
-margin=100
+margin='15%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f "$testdir" -c '%f')
 nr=4

diff --git a/tests/generic/156 b/tests/generic/156
index 7194e8758bce0285f428808a646b0f65c7ad4e46..9fea9886f68e88725736153e326ae6f65ffbaddf 100755 (executable)
--- a/tests/generic/156
+++ b/tests/generic/156
@@ -73,7 +73,7 @@ mkdir "$testdir"
 echo "Create the original file blocks"
 blksz="$(stat -f "$testdir" -c '%S')"
 blks=2000
-margin=100
+margin='15%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f "$testdir" -c '%f')
 nr=4

diff --git a/tests/generic/157 b/tests/generic/157
index a5b84fced3c06371da5cab5c1012077f863b5618..0150866144aa906fbaed09cc6d898ad049008f10 100755 (executable)
--- a/tests/generic/157
+++ b/tests/generic/157
@@ -63,7 +63,7 @@ mkdir "$testdir2"
 echo "Create the original files"
 blksz="$(stat -f $testdir1 -c '%S')"
 blks=1000
-margin=50
+margin='7%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f $testdir1 -c '%f')
 nr=4

diff --git a/tests/generic/158 b/tests/generic/158
index 58b7090052891156591d41c743156635ee75acea..807c247fd93097610e47cfc40fba6e57e52c31f8 100755 (executable)
--- a/tests/generic/158
+++ b/tests/generic/158
@@ -63,7 +63,7 @@ mkdir "$testdir2"
 echo "Create the original files"
 blksz="$(stat -f $testdir1 -c '%S')"
 blks=1000
-margin=50
+margin='7%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f $testdir1 -c '%f')
 nr=4

diff --git a/tests/generic/159 b/tests/generic/159
index 14baf64b41fe9ec29c4cfce971102225a804caaa..88a0c7ee2cbdf5dd13ef80d8b5eda7b2c54ad896 100755 (executable)
--- a/tests/generic/159
+++ b/tests/generic/159
@@ -56,7 +56,7 @@ mkdir "$testdir1"
 echo "Create the original files"
 blksz="$(stat -f $testdir1 -c '%S')"
 blks=1000
-margin=50
+margin='7%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f $testdir1 -c '%f')
 nr=4

diff --git a/tests/generic/160 b/tests/generic/160
index acd2c4e89b0f39d2767a69235246fc181ae2a0d4..83325d5b51582c0fda75fa3841ab88c2d059dcc9 100755 (executable)
--- a/tests/generic/160
+++ b/tests/generic/160
@@ -56,7 +56,7 @@ mkdir "$testdir1"
 echo "Create the original files"
 blksz="$(stat -f $testdir1 -c '%S')"
 blks=1000
-margin=50
+margin='7%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f $testdir1 -c '%f')
 nr=4