Merge branch 'maint' into next

9 files changed, 20 insertions, 6 deletions

diff --git a/tests/f_preen_htree_csum/expect.1 b/tests/f_preen_htree_csum/expect.1
new file mode 100644
index 000000000..bbd81944b
--- /dev/null
+++ b/tests/f_preen_htree_csum/expect.1
@@ -0,0 +1,4 @@
+test_filesys: Problem in HTREE directory inode 12: internal node fails checksum.
+HTREE INDEX CLEARED.
+test_filesys: 8204/10000 files (0.0% non-contiguous), 1551/4096 blocks
+Exit status is 1
diff --git a/tests/f_preen_htree_csum/expect.2 b/tests/f_preen_htree_csum/expect.2
new file mode 100644
index 000000000..0730c4a3a
--- /dev/null
+++ b/tests/f_preen_htree_csum/expect.2
@@ -0,0 +1,7 @@
+Pass 1: Checking inodes, blocks, and sizes
+Pass 2: Checking directory structure
+Pass 3: Checking directory connectivity
+Pass 4: Checking reference counts
+Pass 5: Checking group summary information
+test_filesys: 8204/10000 files (0.0% non-contiguous), 1551/4096 blocks
+Exit status is 0
diff --git a/tests/f_preen_htree_csum/image.gz b/tests/f_preen_htree_csum/image.gz
new file mode 100644
index 000000000..94ce8e142
--- /dev/null
+++ b/tests/f_preen_htree_csum/image.gz
diff --git a/tests/f_preen_htree_csum/name b/tests/f_preen_htree_csum/name
new file mode 100644
index 000000000..c915eec29
--- /dev/null
+++ b/tests/f_preen_htree_csum/name
@@ -0,0 +1 @@
+fix a bad htree checksum in preen mode
diff --git a/tests/f_preen_htree_csum/script b/tests/f_preen_htree_csum/script
new file mode 100644
index 000000000..23ab8b6aa
--- /dev/null
+++ b/tests/f_preen_htree_csum/script
@@ -0,0 +1,2 @@
+FSCK_OPT=-pf
+. $cmd_dir/run_e2fsck
diff --git a/tests/r_move_itable_realloc/expect b/tests/r_move_itable_realloc/expect
index 67f2fe4a8..8ce56dbc0 100644
--- a/tests/r_move_itable_realloc/expect
+++ b/tests/r_move_itable_realloc/expect
@@ -1,6 +1,6 @@
 mke2fs -q -F -o Linux -b 1024 -i 1024 -O ^resize_inode -t ext4 test.img 1024000
 resize2fs -p test.img 100000000
-Resizing the filesystem on test.img to 100000000 (1k) blocks.
+Resizing the filesystem on test.img to 99999745 (1k) blocks.
 Begin pass 2 (max = 2061)
 Relocating blocks             ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 Begin pass 3 (max = 125)
diff --git a/tests/r_move_itable_realloc/script b/tests/r_move_itable_realloc/script
index 20c26dbd9..49f8d58a2 100644
--- a/tests/r_move_itable_realloc/script
+++ b/tests/r_move_itable_realloc/script
@@ -1,5 +1,5 @@
 os=$(uname -s)
-if [ "$os" = "Darwin" -o "$os" = "GNU" -o "FreeBSD" ]; then
+if [ "$os" = "Darwin" -o "$os" = "GNU" -o "$os" = "FreeBSD" ]; then
 	# creates a 96GB filesystem
 	echo "$test_name: $test_description: skipped: skipped for $os"
 	return 0
diff --git a/tests/u_direct_io/expect b/tests/u_direct_io/expect
index 830cbd752..b1511ef10 100644
--- a/tests/u_direct_io/expect
+++ b/tests/u_direct_io/expect
@@ -1,4 +1,4 @@
-mke2fs -F -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D $LOOP
+mke2fs -F -b 4096 -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D $LOOP
 Creating filesystem with 32768 4k blocks and 32768 inodes
 
 Allocating group tables:    done                            
diff --git a/tests/u_direct_io/script b/tests/u_direct_io/script
index b4f07752c..2f80e6402 100644
--- a/tests/u_direct_io/script
+++ b/tests/u_direct_io/script
@@ -8,14 +8,14 @@ elif test ! -x $DEBUGFS_EXE; then
     echo "$test_name: $DESCRIPTION: skipped (no debugfs)"
 else
     dd if=/dev/zero of=$TMPFILE bs=1M count=128 > /dev/null 2>&1
-    LOOP=$(losetup --show --sector-size 4096 -f $TMPFILE)
+    LOOP=$(losetup --show -f $TMPFILE 2>&1)
     if [ ! -b "$LOOP" ]; then
         echo "$test_name: $DESCRIPTION: skipped (no loop devices)"
         rm -f $TMPFILE
         exit 0
     fi
-    echo mke2fs -F -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D \$LOOP > $OUT
-    $MKE2FS -F -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D $LOOP 2>&1 | \
+    echo mke2fs -F -b 4096 -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D \$LOOP > $OUT
+    $MKE2FS -F -b 4096 -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D $LOOP 2>&1 | \
 	sed -f $cmd_dir/filter.sed >> $OUT
 
     echo debugfs -D -R stats \$LOOP >> $OUT