Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
IronPort-SDR: DyAerbA+Rp8fQejIqqC+moeaB5xhABY2Gqu686kDMrOhTfv4J2Pe0qvtTxoqPgKk3/uJ0XoQ5h
 euE6yXnYyHmmf3vakYglvJ+c30e/iUF//conKB33+IRL6kzcJGT77ImkwPZ2IF0kRfCFlLby6S
 DCI/Z37+pyQ84W902s3wQtra+lG0Cjcs0/SHXBAVVOj6ykLWCuCJUNFtYtgzKhj7fhhFNIpw09
 ARnZsuGZbMfbdmP78r/SHIQKBE4sKIW3SNqDr+KnFmo4sBkBXjI5ka07hJMiYq2z/iIG8J3o/y
 yYh5OCTWc9PWshgIlCYXi6gj
IronPort-SDR: AACecmJwVv9CFdEW/k5e2nFX6/PFjDjibsPKU58qvf1d5wHHSiQp/0D6deeFSMdmyakMHQdpXb
 8TA2ppbnCjfCr3sPw3E8jqgd401t+OGsZLfO/0vc4R0ZVQbdRaDKBAHY9KmPfDi47+Rcv14zlb
 WM/973JWOZHVRwJ70+q772RdZL8UKocSBH9mTz/OLHzAxQ+2tiEVjobrmiEsnteScXYAkaw2UX
 xJ24az+ttXv7rv4CUOxIuK+X3SKn4ZMasezYAWSD6fNH4ipXhNY8AR2+kuUE6BBZdOH6Xh2w3J
 wKE=
WDCIronportException: Internal
From:   Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
To:     fstests@vger.kernel.org, linux-btrfs@vger.kernel.org
Cc:     linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org,
        Naohiro Aota <naohiro.aota@wdc.com>,
        Johannes Thumshirn <johannes.thumshirn@wdc.com>,
        Damien Le Moal <damien.lemoal@opensource.wdc.com>,
        Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Subject: [PATCH v3 4/6] ext4/021: check _scratch_mkfs_sized return code
Date:   Fri, 18 Feb 2022 16:31:54 +0900
Message-Id: <20220218073156.2179803-5-shinichiro.kawasaki@wdc.com>
In-Reply-To: <20220218073156.2179803-1-shinichiro.kawasaki@wdc.com>
References: <20220218073156.2179803-1-shinichiro.kawasaki@wdc.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

The test cases ext4/021 calls _scratch_mkfs before _scratch_mkfs_sized,
and does not check return code of _scratch_mkfs_sized. Even if
_scratch_mkfs_sized failed, _scratch_mount after it cannot detect the
sized mkfs failure because _scratch_mkfs already created a file system
on the device. This results in unexpected test condition.

To avoid the unexpected test condition, check return code of
_scratch_mkfs_sized.

Suggested-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
---
 tests/ext4/021 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ext4/021 b/tests/ext4/021
index 62768c60..a9277abf 100755
--- a/tests/ext4/021
+++ b/tests/ext4/021
@@ -24,7 +24,7 @@ _scratch_unmount
 
 # With 4k block size, this amounts to 10M FS instance.
 fssize=$((2560 * $blocksize))
-_scratch_mkfs_sized $fssize >> $seqres.full 2>&1
+_scratch_mkfs_sized $fssize >> $seqres.full 2>&1 || _fail "mkfs failed"
 _require_metadata_journaling $SCRATCH_DEV
 
 offset=0
-- 
2.34.1