common/rc: factor out _scratch_xfs_[get|set]_sb_field

[xfstests-dev.git] / common / defrag

diff --git a/common/defrag b/common/defrag
index f5e36fb25c088fe94e32ec6cdccf8ad8f147f1fd..d279382f4b56e3239a7f7d3a1e96672c9f7a521b 100644 (file)
--- a/common/defrag
+++ b/common/defrag
@@ -27,7 +27,19 @@ _require_defrag()
         DEFRAG_PROG="$XFS_FSR_PROG"
        ;;
     ext4|ext4dev)
         DEFRAG_PROG="$XFS_FSR_PROG"
        ;;
     ext4|ext4dev)

-        DEFRAG_PROG="$E4DEFRAG_PROG"
+       testfile="$TEST_DIR/$$-test.defrag"
+       donorfile="$TEST_DIR/$$-donor.defrag"
+       bsize=`_get_block_size $TEST_DIR`
+       $XFS_IO_PROG -f -c "pwrite -b $bsize 0 $bsize" $testfile > /dev/null
+       cp $testfile $donorfile
+       echo $testfile | $here/src/e4compact -v -f $donorfile | \
+               grep -q "err:95"
+       if [ $? -eq 0 ]; then
+               rm -f $testfile $donorfile 2>&1 > /dev/null
+               _notrun "$FSTYP test filesystem doesn't support online defrag"
+       fi
+       rm -f $testfile $donorfile 2>&1 > /dev/null
+       DEFRAG_PROG="$E4DEFRAG_PROG"

        ;;
     btrfs)
        DEFRAG_PROG="$BTRFS_UTIL_PROG filesystem defragment"
        ;;
     btrfs)
        DEFRAG_PROG="$BTRFS_UTIL_PROG filesystem defragment"


@@ -37,7 +49,7 @@ _require_defrag()
        ;;
     esac
 
        ;;
     esac
 

-    _require_command $DEFRAG_PROG
+    _require_command "$DEFRAG_PROG" defragment

     _require_xfs_io_command "fiemap"
 }
 
     _require_xfs_io_command "fiemap"
 }
 


@@ -53,15 +65,24 @@ _check_extent_count()
        max=$2
        ext_cnt=$3
 
        max=$2
        ext_cnt=$3
 

-       [ "$min" -gt "$ext_cnt" ] && _fail "Found $ext_cnt extents  min:$max"
-       [ "$max" -ne -1 ] && [ "$ext_cnt" -gt "$max" ] && _fail "Found $ext_cnt max: $max"
+       # Return failure if $3 isn't between $1 and $2; let caller decide
+       # action if it's not, we just return status here.
+       if [ "$min" -gt "$ext_cnt" ]; then
+               echo "Found $ext_cnt extents  min:$max"
+               return 1;
+       fi
+       if [ "$max" -ne -1 ] && [ "$ext_cnt" -gt "$max" ]; then
+               echo "Found $ext_cnt max: $max"
+               return 1;
+       fi

 
        if [ $max -ne $min ]; then
            echo "in_range($min, $max)"
        else
            echo "$ext_cnt"
        fi
 
        if [ $max -ne $min ]; then
            echo "in_range($min, $max)"
        else
            echo "$ext_cnt"
        fi

-       return $ext_cnt
+       # success
+       return 0

 }
 
 # Defrag file, check it, and remove it.
 }
 
 # Defrag file, check it, and remove it.


@@ -129,18 +150,20 @@ _defrag()
        echo -n "Before: "
        ext_before=$(_extent_count $1)
        _check_extent_count $min_before $max_before $ext_before
        echo -n "Before: "
        ext_before=$(_extent_count $1)
        _check_extent_count $min_before $max_before $ext_before

+       [ $? -eq 0 ] || _notrun "Could not adequately fragment file"

 
        [ ! -z $csum ] && CSUM_BEFORE=`md5sum $1`
        STAT_BEFORE=`stat -c "a: %x m: %y c: %z" $1`
        $DEFRAG_PROG -v $1 >> $seqres.full 2>&1
 
 
        [ ! -z $csum ] && CSUM_BEFORE=`md5sum $1`
        STAT_BEFORE=`stat -c "a: %x m: %y c: %z" $1`
        $DEFRAG_PROG -v $1 >> $seqres.full 2>&1
 

-       _scratch_remount
+       _scratch_cycle_mount

        STAT_AFTER=`stat -c "a: %x m: %y c: %z" $1`
        [ ! -z $csum ] && CSUM_AFTER=`md5sum $1`
 
        echo -n "After: "
        ext_after=$(_extent_count $1)
        _check_extent_count $min_after $max_after $ext_after
        STAT_AFTER=`stat -c "a: %x m: %y c: %z" $1`
        [ ! -z $csum ] && CSUM_AFTER=`md5sum $1`
 
        echo -n "After: "
        ext_after=$(_extent_count $1)
        _check_extent_count $min_after $max_after $ext_after

+       [ $? -eq 0 ] || _fail "Failed to adequately defragment file"

 
        [ "$ext_before" -lt "$ext_after" ] && \
                _fail "Number of extents increased after defragmentation," \
 
        [ "$ext_before" -lt "$ext_after" ] && \
                _fail "Number of extents increased after defragmentation," \