From patchwork Wed Dec 21 13:50:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9483015 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5BC0360772 for ; Wed, 21 Dec 2016 13:50:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48A0527CE7 for ; Wed, 21 Dec 2016 13:50:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D451283F1; Wed, 21 Dec 2016 13:50:47 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 A0BDC27CE7 for ; Wed, 21 Dec 2016 13:50:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757086AbcLUNun (ORCPT ); Wed, 21 Dec 2016 08:50:43 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35939 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756940AbcLUNum (ORCPT ); Wed, 21 Dec 2016 08:50:42 -0500 Received: by mail-wm0-f66.google.com with SMTP id m203so30581310wma.3 for ; Wed, 21 Dec 2016 05:50:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2sPtMPVnE73ZLziUqxMU8nfC+HOTmAkSJrJzAxmrjqA=; b=AWBlq01m+V30hBAZ+FrPy4qdNXU6M5q/7KTWtH2EyfkNs06TaXLweEQjUDO/Vg60Zo 9uuH+S31s6qufRkmA2oSj4IrBiBypaDWfwx/d0ODUxtiMgxv1a38OgJyspfex9RHp862 m/Jz2ZqfCqalIhxqvpfpsp8Suy+H/L3E2bxgnruvjZ/yFWbTO7Ot+1oH6aht0cWkA9XJ eGHf9Kp5jHBhz+yYUTqTSPc6D7oiMa3sr0kTDcalbbi0u9Eomgb5abX5J4xDJQl3GZcj fFSIW2Pq5UpVhzRJ8+41JmlFrOi2Fw/tsdFDzcPeQNDE5KTspYOX6Svw/3yOlkQ1Cqgt P96A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2sPtMPVnE73ZLziUqxMU8nfC+HOTmAkSJrJzAxmrjqA=; b=ITPo39ronN0hqYnhZHVaeCxdj4pvse4IwZVNRWwmx5/fNa9yhXXrRq9ox2hTnAyRSq kVPdpfochnINWSAdlIcjIk9eNSTvHvfEfLMNb0SGPZec+v+R2urrm/x5Gj8GyNeGSwh/ Nm2Y1ldPYf/RFWoPlu79iFuDdb1MVw7M2KN+Zw5OybBLhbFuT1S2n5EW1sW84ElNRoVg zJb1VrltnWJHJ/KqUiYCKKtxDXGUcvPIvKp3CskpCqfQO+WZGqb3wROGW9lSRIFmuwLb PmyD7h4IijkehX/TELF1Jc3w/RU/3hPS41mpvQldr3qYZ/4VTdciDNHFhfCF8VeVMFGT kKNQ== X-Gm-Message-State: AIkVDXLB3mCz4ZMR71QXAczaQvgx2A+eOaL7FwlVdHuDZ5rDVbsCYttYk6YbnV46ZpNyIw== X-Received: by 10.28.48.145 with SMTP id w139mr7179390wmw.113.1482328240785; Wed, 21 Dec 2016 05:50:40 -0800 (PST) Received: from amir-VirtualBox.ctera.local (bzq-82-81-193-202.cablep.bezeqint.net. [82.81.193.202]) by smtp.gmail.com with ESMTPSA id i132sm27181333wmf.14.2016.12.21.05.50.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Dec 2016 05:50:39 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: Dave Chinner , Christoph Hellwig , "Darrick J . Wong" , Theodore Ts'o , fstests@vger.kernel.org Subject: [PATCH v3 3/3] generic/396: test correct d_type values Date: Wed, 21 Dec 2016 15:50:21 +0200 Message-Id: <1482328221-31713-1-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482239855-791-4-git-send-email-amir73il@gmail.com> References: <1482239855-791-4-git-send-email-amir73il@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Verify correct d_type values of dir entries. This test does NOT require that file system support the filetype feature. It verifies that either all file types are reported as DT_UNKNOWN or that all file types are reported correctly. For fs for which we know how to test the filetype feature (xfs|ext*) verify getting DT_UNKNOWN IFF filetype feature is disabled. Special dir entries . and .. MAY be reported as DT_UNKNOWN IF filetype feature is disabled (ext4), but MAY also be reported as DT_DIR in this case (xfs). Signed-off-by: Amir Goldstein --- tests/generic/396 | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/396.out | 9 +++++ tests/generic/group | 1 + 3 files changed, 103 insertions(+) create mode 100755 tests/generic/396 create mode 100644 tests/generic/396.out Added another test to the matrix, found another special case to handle: ext4 vs. xfs returns DT_UNKNOWN for . and .. on ! _supports_filetype. Fixes the test to correctly handle both cases. Tested with tmpfs, ext2, ext4, xfs for d_type supported fs Tested with xfs -m crc=0 -n ftype=0 for d_type unsupported fs Tested with ext2/ext4 -O ^filetype for d_type unsupported fs v3: - allow DT_UNKNOWN type for . and .. when filetype feature is disabled (ext4) v2: - use helper to test for file type support - allow DT_UNKNOWN type, but only for all files - verify . and .. have DT_DIR type v1: - verify that d_type matches actual file type diff --git a/tests/generic/396 b/tests/generic/396 new file mode 100755 index 0000000..0d4a17d --- /dev/null +++ b/tests/generic/396 @@ -0,0 +1,93 @@ +#! /bin/bash +# FSQA Test No. 396 +# +# Test filetype feature +# +# This test does NOT require that file system support the d_type feature. +# It verifies that either all file types are reported as DT_UNKNOWN +# or all file types are reported correctly. +# +# For fs for which we know how to test the filetype feature (xfs|ext*) +# verify getting DT_UNKNOWN IFF feature is disabled. +# Special dir entries . and .. MAY be reported as DT_UNKNOWN IF filetype +# feature is disabled (ext4), but MAY also be reported as DT_DIR in this +# case (xfs). +# +#----------------------------------------------------------------------- +# +# Copyright (C) 2016 CTERA Networks. All Rights Reserved. +# Author: Amir Goldstein +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here +_supported_fs generic +_supported_os Linux +_require_scratch + +rm -f $seqres.full + +_scratch_mkfs >>$seqres.full 2>&1 + +_scratch_mount + +# Create our test files. +testdir=$SCRATCH_MNT/find-by-type +mkdir -p $testdir +mkdir $testdir/d +touch $testdir/f +ln -s $testdir/f $testdir/l +mknod $testdir/c c 1 1 +mknod $testdir/b b 1 1 +mknod $testdir/p p + +# Test d_type of . and .. +# it must be DT_DIR on fs with filetype support and it could be +# either DR_DIR or DT_UNKNOWN on fs without filetype support +src/t_dir_type $testdir d | grep -F '.' | sort + +# Test that either all file types are unknown or all are correct +if _supports_filetype $testdir; then + # print real file types + src/t_dir_type $testdir | grep -vF '.' | sort +else + # print fake dir file type for . and .. if they are DT_UNKNOWN + src/t_dir_type $testdir u | grep -F '.' | \ + awk '{ print $1, "d" }' | sort + # list unknown files and print filename as fake file type + src/t_dir_type $testdir u | grep -vF '.' | \ + awk '{ print $1, $1 }' | sort +fi + +status=0 +exit diff --git a/tests/generic/396.out b/tests/generic/396.out new file mode 100644 index 0000000..de11c24 --- /dev/null +++ b/tests/generic/396.out @@ -0,0 +1,9 @@ +QA output created by 396 +. d +.. d +b b +c c +d d +f f +l l +p p diff --git a/tests/generic/group b/tests/generic/group index 20b31ef..24c242f 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -397,3 +397,4 @@ 392 auto quick metadata 393 auto quick rw 394 auto quick +396 auto quick