* [PATCH 1/2] xfs/139: work with 1k block size
@ 2018-10-08 6:23 Chandan Rajendra
2018-10-08 6:23 ` [PATCH 2/2] xfs/140: " Chandan Rajendra
0 siblings, 1 reply; 2+ messages in thread
From: Chandan Rajendra @ 2018-10-08 6:23 UTC (permalink / raw)
To: fstests; +Cc: Chandan Rajendra, guaneryu, darrick.wong, zlang, david, linux-xfs
Commit 0e2b99951fa11ea8a8adf4676aef130cfeeb5250 (xfs/139: work with 64k
block size) created a test filesystem with AG size set to (8192 * block
size). When working with a 1k block sized XFS filesystem, this tries to
set the AG size to 8MiB which is less than the minimum AG size of
16MiB. Hence creation of the filesystem had actually failed.
This commit fixes the issue by setting AG size to be (16384 * block
size).
Reported-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
---
tests/xfs/139 | 4 ++--
tests/xfs/139.out | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/xfs/139 b/tests/xfs/139
index c074273..3a20ce5 100755
--- a/tests/xfs/139
+++ b/tests/xfs/139
@@ -40,14 +40,14 @@ blksz=$(_get_file_block_size $SCRATCH_MNT)
_scratch_unmount
echo "Format and mount"
-_scratch_mkfs -d agsize=$((8192 * $blksz)) > $seqres.full 2>&1
+_scratch_mkfs -d agsize=$((16384 * $blksz)) > $seqres.full 2>&1
_scratch_mount >> $seqres.full 2>&1
testdir=$SCRATCH_MNT/test-$seq
mkdir $testdir
echo "Create the original files"
-sz=$((12288 * $blksz))
+sz=$((20480 * $blksz))
_pwrite_byte 0x61 0 $sz $testdir/file1 >> $seqres.full
_cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full
_scratch_cycle_mount
diff --git a/tests/xfs/139.out b/tests/xfs/139.out
index 72909bc..1005d5c 100644
--- a/tests/xfs/139.out
+++ b/tests/xfs/139.out
@@ -5,7 +5,7 @@ CoW every other block
Compare files
0 62 62 62 62 62 62 62 62 62 62 62 62 62 62 62 62
*
-30000
+50000
0 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61
*
-30000
+50000
--
2.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] xfs/140: work with 1k block size
2018-10-08 6:23 [PATCH 1/2] xfs/139: work with 1k block size Chandan Rajendra
@ 2018-10-08 6:23 ` Chandan Rajendra
0 siblings, 0 replies; 2+ messages in thread
From: Chandan Rajendra @ 2018-10-08 6:23 UTC (permalink / raw)
To: fstests; +Cc: Chandan Rajendra, guaneryu, darrick.wong, zlang, david, linux-xfs
Commit 7a7641063ac3a7ae051c9e1959f4d7b1a25bb91c (xfs/140: work with 64k
block size) created a test filesystem with AG size set to (8192 * block
size). When working with a 1k block sized XFS filesystem, this tries to
set the AG size to 8MiB which is less than the minimum AG size of
16MiB. Hence creation of the filesystem had actually failed.
This commit fixes the issue by resetting AG size to 16MiB if (8192 *
block size) results in a value less than 16MiB. Later the test file size
and the test file block count are then appropriately calculated.
Reported-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
---
tests/xfs/140 | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/tests/xfs/140 b/tests/xfs/140
index c06a722..7385dc4 100755
--- a/tests/xfs/140
+++ b/tests/xfs/140
@@ -39,16 +39,21 @@ _scratch_mount
blksz=$(_get_file_block_size $SCRATCH_MNT)
_scratch_unmount
+agsize=$((8192 * $blksz))
+if [[ $agsize -lt $((16 * 1024 * 1024)) ]]; then
+ agsize=$((16 * 1024 * 1024))
+fi
+sz=$((4096 * $blksz + $agsize))
+nr=$(($sz / $blksz))
+
echo "Format and mount"
-_scratch_mkfs -d agsize=$((8192 * $blksz)) > $seqres.full 2>&1
+_scratch_mkfs -d agsize=$agsize > $seqres.full 2>&1
_scratch_mount >> $seqres.full 2>&1
testdir=$SCRATCH_MNT/test-$seq
mkdir $testdir
echo "Create the original files"
-nr=12288
-sz=$(($nr * $blksz))
_pwrite_byte 0x61 0 $sz $testdir/file1 >> $seqres.full
_cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full
_pwrite_byte 0x61 0 $sz $testdir/file2.chk >> $seqres.full
--
2.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-08 13:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-08 6:23 [PATCH 1/2] xfs/139: work with 1k block size Chandan Rajendra
2018-10-08 6:23 ` [PATCH 2/2] xfs/140: " Chandan Rajendra
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.