[PATCH 1/3] xfstests: fix argument typo

[PATCH 1/3] xfstests: fix argument typo

[Dmitry Monakhov]

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
 ltp/fsstress.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ltp/fsstress.c b/ltp/fsstress.c
index 09c9529..9b3af17 100644
--- a/ltp/fsstress.c
+++ b/ltp/fsstress.c
@@ -385,7 +385,7 @@ int main(int argc, char **argv)
 			i = 0;
 			if (optarg[0] == 'c')
 				i = 1;
-			show_ops(1, NULL);
+			show_ops(i, NULL);
 			printf("\n");
                         nousage=1;
 			break;
-- 
1.7.1

[PATCH 2/3] xfstests: fix typo in 260'th test

[Dmitry Monakhov]

dd should not have count argument because it suposed to work untill ENOSPC.
Also it is reasonable to log dd's output, do that for both 269'th and 270'th
tests

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
 269 |    4 ++--
 270 |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/269 b/269
index 61e83ad..206492b 100755
--- a/269
+++ b/269
@@ -53,8 +53,8 @@ _workout()
 	for ((i=0; i < num_iterations; i++))
 	do
 		# File will be opened with O_TRUNC each time
-		dd if=/dev/zero of=$SCRATCH_MNT/SPACE_CONSUMER bs=1M count=1 \
-			> /dev/null 2>&1
+		dd if=/dev/zero of=$SCRATCH_MNT/SPACE_CONSUMER bs=1M \
+			>> $here/$seq.full 2>&1
 		sleep $enospc_time
 	done
 	kill $pid
diff --git a/270 b/270
index ed1e31e..e45029f 100755
--- a/270
+++ b/270
@@ -63,7 +63,7 @@ _workout()
 		# File will be opened with O_TRUNC each time
 		su $qa_user -c "dd if=/dev/zero \
 			of=$SCRATCH_MNT/SPACE_CONSUMER bs=1M " \
-			> /dev/null 2>&1
+			>> $here/$seq.full 2>&1
 		sleep $enospc_time
 	done
 
-- 
1.7.1

[PATCH 3/3] xfstests: remove duplicated umount $scratch_dev

[Dmitry Monakhov]

_require_scratch unmounts the SCRATCH_DEV. So it is not necessery
to do it explicitly at the first time.

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
 232 |    1 -
 233 |    1 -
 269 |    3 +--
 270 |    3 +--
 271 |    3 +--
 272 |    3 +--
 6 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/232 b/232
index fb4a872..2795da7 100755
--- a/232
+++ b/232
@@ -72,7 +72,6 @@ _require_scratch
 _require_quota
 _need_to_be_root
 
-umount $SCRATCH_DEV 2>/dev/null
 _scratch_mkfs >> $seq.full 2>&1
 _scratch_mount "-o usrquota,grpquota"
 chmod 777 $SCRATCH_MNT
diff --git a/233 b/233
index e6ba7ef..28e6ac7 100755
--- a/233
+++ b/233
@@ -80,7 +80,6 @@ _require_quota
 _require_user
 _need_to_be_root
 
-umount $SCRATCH_DEV 2>/dev/null
 _scratch_mkfs >> $seq.full 2>&1
 _scratch_mount "-o usrquota,grpquota"
 chmod 777 $SCRATCH_MNT
diff --git a/269 b/269
index 206492b..7e13ed9 100755
--- a/269
+++ b/269
@@ -64,10 +64,9 @@ _workout()
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
-_require_scratch
 _need_to_be_root
+_require_scratch
 
-umount $SCRATCH_DEV 2>/dev/null
 _scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seq.full 2>&1
 _scratch_mount
 
diff --git a/270 b/270
index e45029f..6a349b4 100755
--- a/270
+++ b/270
@@ -74,12 +74,11 @@ _workout()
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
-_require_scratch
 _require_quota
 _require_user
 _need_to_be_root
+_require_scratch
 
-umount $SCRATCH_DEV 2>/dev/null
 _scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seq.full 2>&1
 _scratch_mount "-o usrquota,grpquota"
 chmod 777 $SCRATCH_MNT
diff --git a/271 b/271
index b4e6043..58a7f91 100755
--- a/271
+++ b/271
@@ -39,10 +39,9 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs ext4
 _supported_os Linux
-_require_scratch
 _need_to_be_root
+_require_scratch
 
-umount $SCRATCH_DEV 2>/dev/null
 _scratch_mkfs_sized $((128 * 1024 * 1024)) >> $seq.full 2>&1
 
 # -onoload and EXT4_SYNC_FL on file is important becase result in
diff --git a/272 b/272
index a35ef83..26dfa3b 100755
--- a/272
+++ b/272
@@ -83,10 +83,9 @@ chattr_opt: $chattr_opt"
 # real QA test starts here
 _supported_fs ext3 ext4
 _supported_os Linux
-_require_scratch
 _need_to_be_root
+_require_scratch
 
-umount $SCRATCH_DEV 2>/dev/null
 _scratch_mkfs_sized $((64 * 1024 * 1024)) >> $seq.full 2>&1
 _scratch_mount
 
-- 
1.7.1