All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chandan Rajendra <chandan@linux.vnet.ibm.com>
To: fstests@vger.kernel.org
Cc: Chandan Rajendra <chandan@linux.vnet.ibm.com>,
	eguan@redhat.com, darrick.wong@oracle.com,
	linux-xfs@vger.kernel.org
Subject: [PATCH V2 06/16] Fix xfs/139 to work with 64k block size
Date: Thu,  6 Sep 2018 14:10:03 +0530	[thread overview]
Message-ID: <20180906084013.2687-7-chandan@linux.vnet.ibm.com> (raw)
In-Reply-To: <20180906084013.2687-1-chandan@linux.vnet.ibm.com>

For 64k block size, the agsize provided in the test causes mkfs.xfs to
fail due to insufficient log space. Hence this commit computes agsize
based on block size of the filesystem.

Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
---
 tests/xfs/139     | 15 +++++++++------
 tests/xfs/139.out |  8 ++++++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/tests/xfs/139 b/tests/xfs/139
index 2a26635..9ab74c8 100755
--- a/tests/xfs/139
+++ b/tests/xfs/139
@@ -34,17 +34,20 @@ _require_cp_reflink
 
 rm -f $seqres.full
 
+_scratch_mkfs >/dev/null 2>&1
+_scratch_mount
+blksz=$(_get_block_size $SCRATCH_MNT)
+_scratch_unmount
+
 echo "Format and mount"
-_scratch_mkfs -d agsize=$((32 * 1048576)) > $seqres.full 2>&1
+_scratch_mkfs -d agsize=$((4400 * $blksz)) > $seqres.full 2>&1
 _scratch_mount >> $seqres.full 2>&1
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
-blksz="$(_get_block_size $testdir)"
 
 echo "Create the original files"
-sz=$((48 * 1048576))
-nr=$((sz / blksz))
+sz=$((4800 * $blksz))
 _pwrite_byte 0x61 0 $sz $testdir/file1 >> $seqres.full
 _cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full
 _scratch_cycle_mount
@@ -54,8 +57,8 @@ _pwrite_byte 0x62 0 $sz $testdir/file1 >> $seqres.full
 _scratch_cycle_mount
 
 echo "Compare files"
-md5sum $testdir/file1 | _filter_scratch
-md5sum $testdir/file2 | _filter_scratch
+od -t x1 $testdir/file1 | _filter_od
+od -t x1 $testdir/file2 | _filter_od
 #filefrag -v $testdir/file1 $testdir/file2
 
 # success, all done
diff --git a/tests/xfs/139.out b/tests/xfs/139.out
index dc6a31e..55e03d6 100644
--- a/tests/xfs/139.out
+++ b/tests/xfs/139.out
@@ -3,5 +3,9 @@ Format and mount
 Create the original files
 CoW every other block
 Compare files
-673c759fb131ccf3336c4f8c549a497e  SCRATCH_MNT/test-139/file1
-dc802351f6717547cbf4c951b294f952  SCRATCH_MNT/test-139/file2
+0 62 62 62 62 62 62 62 62 62 62 62 62 62 62 62 62
+*
+11300
+0 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61
+*
+11300
-- 
2.9.5

  parent reply	other threads:[~2018-09-06 13:12 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-06  8:39 [PATCH V2 00/16] Fix tests to work on non-4k block sized fs instances Chandan Rajendra
2018-09-06  8:39 ` [PATCH V2 01/16] Fix xfs/009 to work with 64k block size Chandan Rajendra
2018-09-06  8:39 ` [PATCH V2 02/16] xfs/050: Fix "Push past soft inode limit" case Chandan Rajendra
2018-09-06  8:40 ` [PATCH V2 03/16] Fix xfs/050 to work with 64k block size Chandan Rajendra
2018-09-06  8:40 ` [PATCH V2 04/16] Fix xfs/074 " Chandan Rajendra
2018-09-06  8:40 ` [PATCH V2 05/16] Fix xfs/127 " Chandan Rajendra
2018-09-06  8:40 ` Chandan Rajendra [this message]
2018-09-06  8:40 ` [PATCH V2 07/16] Fix xfs/140 " Chandan Rajendra
2018-09-06  8:40 ` [PATCH V2 08/16] Fix xfs/190 " Chandan Rajendra
2018-09-06  8:40 ` [PATCH V2 09/16] Fix xfs/299 " Chandan Rajendra
2018-09-06  8:40 ` [PATCH V2 10/16] xfs/325: Inject free_extent error after CoW operation Chandan Rajendra
2018-09-06  8:40 ` [PATCH V2 11/16] Fix generic/102 to work with 64k block size Chandan Rajendra
2018-09-06  8:40 ` [PATCH V2 12/16] Fix generic/172 " Chandan Rajendra
2018-09-06  8:40 ` [PATCH V2 13/16] Filter fiemap output by FS " Chandan Rajendra
2018-09-06  8:40 ` [PATCH V2 14/16] Fix generic/177 to work with 64k " Chandan Rajendra
2018-09-06  8:40 ` [PATCH V2 15/16] Fix generic/230 " Chandan Rajendra
2018-09-06  8:40 ` [PATCH V2 16/16] Fix generic/235 " Chandan Rajendra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180906084013.2687-7-chandan@linux.vnet.ibm.com \
    --to=chandan@linux.vnet.ibm.com \
    --cc=darrick.wong@oracle.com \
    --cc=eguan@redhat.com \
    --cc=fstests@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.