linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Monakhov <dmonakhov@openvz.org>
To: linux-fsdevel@vger.kernel.org, xfs@oss.sgi.com
Cc: hch@lst.de, david@fromorbit.com, Dmitry Monakhov <dmonakhov@openvz.org>
Subject: [PATCH 3/3] xfstests: remove duplicated  umount $scratch_dev
Date: Tue,  8 Nov 2011 12:41:55 +0400	[thread overview]
Message-ID: <1320741715-32692-3-git-send-email-dmonakhov@openvz.org> (raw)
In-Reply-To: <1320741715-32692-1-git-send-email-dmonakhov@openvz.org>

_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


      parent reply	other threads:[~2011-11-08  8:42 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-08  8:41 [PATCH 1/3] xfstests: fix argument typo Dmitry Monakhov
2011-11-08  8:41 ` [PATCH 2/3] xfstests: fix typo in 260'th test Dmitry Monakhov
2011-11-08  8:41 ` Dmitry Monakhov [this message]

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=1320741715-32692-3-git-send-email-dmonakhov@openvz.org \
    --to=dmonakhov@openvz.org \
    --cc=david@fromorbit.com \
    --cc=hch@lst.de \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=xfs@oss.sgi.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).