From patchwork Wed Oct 16 02:48:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 11192253 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 42C0F76 for ; Wed, 16 Oct 2019 02:48:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A04D20872 for ; Wed, 16 Oct 2019 02:48:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388792AbfJPCsN (ORCPT ); Tue, 15 Oct 2019 22:48:13 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4160 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730117AbfJPCsN (ORCPT ); Tue, 15 Oct 2019 22:48:13 -0400 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 014A7DDAC1AC89411609; Wed, 16 Oct 2019 10:48:12 +0800 (CST) Received: from szvp000203569.huawei.com (10.120.216.130) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.439.0; Wed, 16 Oct 2019 10:48:05 +0800 From: Chao Yu To: , CC: , , "Chao Yu" Subject: [PATCH v3] common/rc: generalize _get_filesize() Date: Wed, 16 Oct 2019 10:48:03 +0800 Message-ID: <20191016024803.12028-1-yuchao0@huawei.com> X-Mailer: git-send-email 2.18.0.rc1 MIME-Version: 1.0 X-Originating-IP: [10.120.216.130] X-CFilter-Loop: Reflected Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org There are some testcases use below command to get file size, generalize it as global function _get_filesize() ls -l $1 | $AWK_PROG '{print $5}' And in addition, using more simple command "stat -c %s" instead. - adjust common/defrag, generic/275 and generic/315 to use it - remove unused _filesize in generic/013 Signed-off-by: Chao Yu --- v3: - avoid unneeded echo command in _get_filesize() pointed out by Darrick. common/defrag | 2 +- common/rc | 5 +++++ tests/generic/013 | 5 ----- tests/generic/275 | 2 +- tests/generic/315 | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/defrag b/common/defrag index 1381a4dd..1769013b 100644 --- a/common/defrag +++ b/common/defrag @@ -145,7 +145,7 @@ _defrag() STAT_BEFORE=`stat -c "a: %x m: %y c: %z" $1` if [ $FSTYP == "f2fs" ]; then - local filesize=`ls -l $1 | $AWK_PROG '{print $5}'` + local filesize=`_get_filesize $1` $DEFRAG_PROG 0 $filesize $1 >> $seqres.full 2>&1 else $DEFRAG_PROG -v $1 >> $seqres.full 2>&1 diff --git a/common/rc b/common/rc index cfaabf10..8cdb7a9b 100644 --- a/common/rc +++ b/common/rc @@ -165,6 +165,11 @@ if [ ! -z "$REPORT_LIST" ]; then _assert_report_list fi +_get_filesize() +{ + stat -c %s "$1" +} + _mount() { $MOUNT_PROG `_mount_ops_filter $*` diff --git a/tests/generic/013 b/tests/generic/013 index 9e533ee8..bc596102 100755 --- a/tests/generic/013 +++ b/tests/generic/013 @@ -24,11 +24,6 @@ _cleanup() rm -rf $TEST_DIR/fsstress.$$.* } -_filesize() -{ - ls -l $1 | $AWK_PROG '{print " filesize = " $5}' -} - # get standard environment, filters and checks . ./common/rc . ./common/filter diff --git a/tests/generic/275 b/tests/generic/275 index a934c19c..adc82856 100755 --- a/tests/generic/275 +++ b/tests/generic/275 @@ -73,7 +73,7 @@ echo "Bytes written until ENOSPC:" >>$seqres.full du $SCRATCH_MNT/tmp1 >>$seqres.full # And at least some of it should succeed. -_filesize=`ls -l $SCRATCH_MNT/tmp1 | awk '{print $5}'` +_filesize=`_get_filesize $SCRATCH_MNT/tmp1` [ $_filesize -lt $((128 * 1024)) ] && \ _fail "Partial write until enospc failed; wrote $_filesize bytes." diff --git a/tests/generic/315 b/tests/generic/315 index fd49b579..808d7d74 100755 --- a/tests/generic/315 +++ b/tests/generic/315 @@ -52,7 +52,7 @@ $XFS_IO_PROG -f -c 'falloc -k 0 $(($avail_begin/2))' \ $TEST_DIR/testfile.$seq >>$seqres.full 2>&1 # Verify the file size, it should keep unchanged as 0 in this case -fsize=`ls -l $TEST_DIR/testfile.$seq | awk '{print $5}'` +fsize=`_get_filesize $TEST_DIR/testfile.$seq` [ "$fsize" -eq 0 ] || _fail "File size is changed to ($fsize Bytes)" # Truncate the file size back to 0