From patchwork Tue Jul 16 09:35:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 11045591 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 62B65746 for ; Tue, 16 Jul 2019 09:36:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 485FF285A7 for ; Tue, 16 Jul 2019 09:36:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3959A285A9; Tue, 16 Jul 2019 09:36:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BED7828450 for ; Tue, 16 Jul 2019 09:35:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728310AbfGPJf7 (ORCPT ); Tue, 16 Jul 2019 05:35:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58284 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726536AbfGPJf7 (ORCPT ); Tue, 16 Jul 2019 05:35:59 -0400 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 8AB9381F0D; Tue, 16 Jul 2019 09:35:58 +0000 (UTC) Received: from dhcp-12-171.nay.redhat.com (dhcp-12-171.nay.redhat.com [10.66.12.171]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CFF85E1A8; Tue, 16 Jul 2019 09:35:57 +0000 (UTC) From: Zorro Lang To: fstests@vger.kernel.org Cc: linux-xfs@vger.kernel.org Subject: [PATCH v2] xfs: test statfs on project quota directory Date: Tue, 16 Jul 2019 17:35:50 +0800 Message-Id: <20190716093550.23059-1-zlang@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.27]); Tue, 16 Jul 2019 09:35:58 +0000 (UTC) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There's a bug on xfs cause statfs get negative f_ffree value from a project quota directory. It's fixed by "de7243057 fs/xfs: fix f_ffree value for statfs when project quota is set". So add statfs testing on project quota block and inode count limit. Signed-off-by: Zorro Lang --- Hi, This V2 patch changes this case from a generic case to a xfs only case, due to ext4 has different behavior. V1 history: https://marc.info/?l=linux-xfs&m=156048436902910&w=2 Thanks, Zorro tests/xfs/509 | 72 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/509.out | 3 ++ tests/xfs/group | 1 + 3 files changed, 76 insertions(+) create mode 100755 tests/xfs/509 create mode 100644 tests/xfs/509.out diff --git a/tests/xfs/509 b/tests/xfs/509 new file mode 100755 index 00000000..d2e40bf3 --- /dev/null +++ b/tests/xfs/509 @@ -0,0 +1,72 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2019 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 509 +# +# Test statfs when project quota is set. +# Uncover de7243057 fs/xfs: fix f_ffree value for statfs when project quota is set +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + _scratch_unmount + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/quota + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here +_supported_fs xfs +_supported_os Linux +_require_scratch +_require_xfs_quota + +_scratch_mkfs >/dev/null 2>&1 +_scratch_enable_pquota +_qmount_option "prjquota" +_qmount +_require_prjquota $SCRATCH_DEV + +# Create a directory to be project object, and create a file to take 64k space +mkdir $SCRATCH_MNT/t +$XFS_IO_PROG -f -c "pwrite 0 65536" -c sync $SCRATCH_MNT/t/file >>$seqres.full + +# Setup temporary replacements for /etc/projects and /etc/projid +cat >$tmp.projects <$tmp.projid </dev/null 2>&1 +$quota_cmd -x -c 'limit -p isoft=53 bsoft=100m answer' $SCRATCH_MNT + +# The itotal and size should be 53 and 102400(k), as above project quota limit. +# The isued and used should be 2 and 64(k), as this case takes. But ext4 always +# shows more 4k 'used' space than XFS, it prints 68k at here. So filter the +# 6[48] at the end. +df -k --output=file,itotal,iused,size,used $SCRATCH_MNT/t | \ + _filter_scratch | _filter_spaces + +# success, all done +status=0 +exit diff --git a/tests/xfs/509.out b/tests/xfs/509.out new file mode 100644 index 00000000..418b2dd7 --- /dev/null +++ b/tests/xfs/509.out @@ -0,0 +1,3 @@ +QA output created by 509 +File Inodes IUsed 1K-blocks Used +SCRATCH_MNT/t 53 2 102400 64 diff --git a/tests/xfs/group b/tests/xfs/group index 270d82ff..364a7ed5 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -506,3 +506,4 @@ 506 auto quick health 507 clone 508 auto quick quota +509 auto quick quota