From patchwork Mon Apr 8 05:40:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaoli Feng X-Patchwork-Id: 1080619 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44czmk4ZF6z9sPP for ; Mon, 8 Apr 2019 15:41:07 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 255063EA54F for ; Mon, 8 Apr 2019 07:41:02 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) by picard.linux.it (Postfix) with ESMTP id C185F3EA54F for ; Mon, 8 Apr 2019 07:40:59 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id 651FF200B7B for ; Mon, 8 Apr 2019 07:40:57 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D3535307CDE3; Mon, 8 Apr 2019 05:40:55 +0000 (UTC) Received: from dhcp-12-126.nay.redhat.com (dhcp-12-126.nay.redhat.com [10.66.12.126]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF2755C5DF; Mon, 8 Apr 2019 05:40:54 +0000 (UTC) From: XiaoLi Feng To: ltp@lists.linux.it Date: Mon, 8 Apr 2019 13:40:50 +0800 Message-Id: <20190408054050.28262-1-xifeng@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 08 Apr 2019 05:40:55 +0000 (UTC) X-Virus-Scanned: clamav-milter 0.99.2 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_HELO_PASS,SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Cc: Xiaoli Feng Subject: [LTP] [PATCH v1] ext4_subdir_limit_test.sh: fix "No Space" issue X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" From: Xiaoli Feng 1G ext4 filesystem default has 65536 inode. And some inodes will be used after format. So it will be failed when try to create 65536 sub-directorys in this ext4 mountpoint. Change it to create 65536 - used inodes directorys. --- Re-send this mail again. Because I subscripted the ltp mail list failed last time. Thanks. .../ext4-subdir-limit/ext4_subdir_limit_test.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/testcases/kernel/fs/ext4-new-features/ext4-subdir-limit/ext4_subdir_limit_test.sh b/testcases/kernel/fs/ext4-new-features/ext4-subdir-limit/ext4_subdir_limit_test.sh index 5cc0523a8..05581d5c6 100755 --- a/testcases/kernel/fs/ext4-new-features/ext4-subdir-limit/ext4_subdir_limit_test.sh +++ b/testcases/kernel/fs/ext4-new-features/ext4-subdir-limit/ext4_subdir_limit_test.sh @@ -46,6 +46,8 @@ prev_result=$FAIL ext4_run_case() { local dir_name_len= + local free_inode= + local max_directorys=$1 if [ $2 -eq $SHORT_DIR ]; then dir_name_len="short name" @@ -53,9 +55,6 @@ ext4_run_case() dir_name_len="long name" fi - tst_resm TINFO "Num of dirs to create: $1, Dir name len: $dir_name_len, " \ - "Parent dir: $3, Block size: $4" - # only mkfs if block size has been changed, # or previous case failed if [ $prev_result -ne $PASS -o $4 -ne $prev_block_size ]; then @@ -80,11 +79,18 @@ ext4_run_case() # create directories mkdir -p $3 2> /dev/null + free_inode=`df -i $EXT4_DEV | awk '{print $4}' | tr -cd "[0-9]"` + if [ "$free_inode" -lt "$1" ]; then + max_directorys=$free_inode + fi + + tst_resm TINFO "Num of dirs to create: $max_directorys, Dir name len: $dir_name_len, " \ + "Parent dir: $3, Block size: $4" if [ $2 -eq $SHORT_DIR ]; then - create_short_dirs $1 $3 + create_short_dirs $max_directorys $3 else - create_long_dirs $1 $3 + create_long_dirs $max_directorys $3 fi if [ $? -ne 0 ]; then