On Mon, Jun 23, 2014 at 11:48 AM, Satoru Takeuchi <takeuchi_sat...@jp.fujitsu.com> wrote: > Hi Filipe, > > (2014/06/23 19:28), Filipe David Borba Manana wrote: >> In btrfs the block size (called sector size in btrfs) can not be >> smaller then the page size. Therefore skip block sizes smaller >> then page size if the fs is btrfs, so that the test can succeed >> on btrfs (testing only with block sizes of 4kb on systems with a >> page size of 4Kb). >> >> Signed-off-by: Filipe David Borba Manana <fdman...@gmail.com> > > I consider it doesn't work since this test is not for Btrfs.
Did you try it out (together with the corresponding change for btrfs to support collapse range) or is just code analysis? For me it works. > Please see the following code. > > tests/generic/017: > === > for (( BSIZE = 1024; BSIZE <= 4096; BSIZE *= 2 )); do > > length=$(($BLOCKS * $BSIZE)) > case $FSTYP in > xfs) > _scratch_mkfs -b size=$BSIZE >> $seqres.full 2>&1 > ;; > ext4) > _scratch_mkfs -b $BSIZE >> $seqres.full 2>&1 > ;; > esac > _scratch_mount >> $seqres.full 2>&1 > === > > There is no btrfs here. Yes... That means it doesn't create a brand new fs and just uses the currently one. Thanks. > > This test was moved to shared/005 to generic/017 > at 21723cdbf303e031d6429f67fec9768750a5db7d. > > Original supported fs is here. > =============================================================================== > supported_fs xfs ext4 > =============================================================================== > > I suspect that Lukas moved this test to generic/ by mistake or forgot to > add "$FSTYP == btrfs" case. > > Thanks, > Satoru > >> --- >> tests/generic/017 | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/tests/generic/017 b/tests/generic/017 >> index 13b7254..6495be5 100755 >> --- a/tests/generic/017 >> +++ b/tests/generic/017 >> @@ -51,6 +51,14 @@ BLOCKS=10240 >> >> for (( BSIZE = 1024; BSIZE <= 4096; BSIZE *= 2 )); do >> >> + # btrfs doesn't support block size smaller then page size >> + if [ "$FSTYP" == "btrfs" ]; then >> + if (( $BSIZE < `getconf PAGE_SIZE` )); then >> + echo "80" >> + continue >> + fi >> + fi >> + >> length=$(($BLOCKS * $BSIZE)) >> case $FSTYP in >> xfs) >> > -- Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men." -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
