From patchwork Wed Apr 5 12:09:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9663855 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 217AC602B5 for ; Wed, 5 Apr 2017 12:09:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 161EF280B0 for ; Wed, 5 Apr 2017 12:09:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09E5428285; Wed, 5 Apr 2017 12:09:53 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 8F470280B0 for ; Wed, 5 Apr 2017 12:09:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755317AbdDEMJv (ORCPT ); Wed, 5 Apr 2017 08:09:51 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:35719 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752287AbdDEMJY (ORCPT ); Wed, 5 Apr 2017 08:09:24 -0400 Received: by mail-wr0-f195.google.com with SMTP id t20so2119267wra.2; Wed, 05 Apr 2017 05:09:24 -0700 (PDT) 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=jZeVACZw0WhP8FY3F3GtkewRW7eqk1xxFxDRkpDTigg=; b=P0fLkgGaYNAgZ//iCnlcnxWpsAKcRr3CAxt1evY+RvvQqRpi2jcFhJr35xkmnPs63d XYcPW29QFpeu/eTavPZ946d6ERXR56veYQz+e2xt3qAibvE+UTMl/nQs/83UJQHWSnn0 f0UbSl4D/ToAfiT/5lityFWnQg3+98HE5GVGHL+D/JHpYwrF5bglwPwMOdOjiTNU9UTk lJhHQiiVLssfjdCrkEuJJ4j8VpNMjRw0iH7+O55jOllBrhO59neIUhCddLF861pQLcpd K9sd91Udi2CEUntu18nNEEI8RIQQnDs0fRHqf5qV/zBcWbQjNVVyeXjv1HedwEuWGAHQ 2BFg== 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=jZeVACZw0WhP8FY3F3GtkewRW7eqk1xxFxDRkpDTigg=; b=iWgoSHJ91Y5E5NvcJrBCS68YySI8KqZzOxP8WzM+ldX+oyJxxc3gQ3g0F5m8CUyOe3 q2PDqZRECg4DqRGd5NfEMZapY0Ojo7pi5NnjqJDeNpawVV990e1FgBbBdCZCIyb7iOY/ 5OduCj3cg/z0VYmHP6cXu6rDfVPCSyM0YeGTg54t9oAViOCFKHPNzHW422NVXPFvyOGv nCRpNpdo6cJSEsiW6KtGjtstfzuSuX/A89ZnDSECkHOkO47A+jTybMTdOJkYvd3gVd06 LnUIkYPkeXxGewZCqtmqb2Z6tKDemto0ba6KENNprw1ZljWeGH8tgT/imvl4G9hZr8YU GU5A== X-Gm-Message-State: AFeK/H2CA4i0pIJjV9kQBh9lBnh/TJ/o9IFI5N8fP+gaOlt432aUGy4XlfRdk33V49cb8Q== X-Received: by 10.223.134.152 with SMTP id 24mr16413667wrx.30.1491394163203; Wed, 05 Apr 2017 05:09:23 -0700 (PDT) Received: from amir-VirtualBox.ctera.local (bzq-166-168-31-246.red.bezeqint.net. [31.168.166.246]) by smtp.gmail.com with ESMTPSA id h187sm22197284wma.32.2017.04.05.05.09.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Apr 2017 05:09:22 -0700 (PDT) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , Xiong Zhou , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v2] overlay/030: test immutable and append-only upper files Date: Wed, 5 Apr 2017 15:09:27 +0300 Message-Id: <1491394167-31409-1-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491389271-24726-2-git-send-email-amir73il@gmail.com> References: <1491389271-24726-2-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 Run the t_immutable test program for immutable/append-only files and directories in an overlayfs upper directory. This test is similar and was derived from generic/079, but the original test is _notrun on overlay mount because FS_IOC_GETFLAGS FS_IOC_SETFLAGS ioctls fail on overlay directory inodes. Signed-off-by: Amir Goldstein --- tests/generic/079 | 6 ++--- tests/overlay/030 | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/overlay/030.out | 5 ++++ tests/overlay/group | 1 + 4 files changed, 81 insertions(+), 4 deletions(-) create mode 100755 tests/overlay/030 create mode 100644 tests/overlay/030.out Eryu, Here is v2 with fixes to your comments. I also changed generic/079 to use modern _require_* statements. and removed _scratch_unmount from its cleanup callback. Amir. diff --git a/tests/generic/079 b/tests/generic/079 index 5cceeba..c2db6bf 100755 --- a/tests/generic/079 +++ b/tests/generic/079 @@ -37,7 +37,6 @@ _cleanup() cd / echo "*** cleaning up" $timmutable -r $SCRATCH_MNT/$seq - _scratch_unmount } # get standard environment, filters and checks @@ -48,11 +47,10 @@ _cleanup() _supported_fs generic _supported_os Linux -_require_chattr i +_require_chattr ia +_require_test_program "t_immutable" _require_scratch -[ -x $timmutable ] || _notrun "t_immutable was not built for this platform" - # real QA test starts here _scratch_mkfs >/dev/null 2>&1 || _fail "mkfs failed" _scratch_mount || _fail "mount failed" diff --git a/tests/overlay/030 b/tests/overlay/030 new file mode 100755 index 0000000..bbce140 --- /dev/null +++ b/tests/overlay/030 @@ -0,0 +1,73 @@ +#! /bin/bash +# FS QA Test No. 030 +# +# Run the t_immutable test program for immutable/append-only files +# and directories in an overlayfs upper directory. +# +# This test is similar and was derived from generic/079, but +# the original test is _notrun on overlay mount because FS_IOC_GETFLAGS +# FS_IOC_SETFLAGS ioctls fail on overlay directory inodes. +# +#----------------------------------------------------------------------- +# Copyright (C) 2017 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" + +here=`pwd` +timmutable=$here/src/t_immutable +upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + $timmutable -r $upperdir/t_immutable &> /dev/null + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +_supported_fs overlay +_supported_os Linux + +_require_chattr ia +_require_test_program "t_immutable" +_require_scratch + +_scratch_mkfs + +# Preparing immutable files in uppper dir +mkdir -p $upperdir +$timmutable -C $upperdir/t_immutable >$tmp.out 2>&1 +if grep -q -e 'Operation not supported' -e "Inappropriate ioctl" $tmp.out; then + _notrun "Setting immutable/append flag not supported" +fi + +_scratch_mount + +# Test immutability of files in overlay +$timmutable $SCRATCH_MNT/t_immutable 2>&1 +status=$? +exit diff --git a/tests/overlay/030.out b/tests/overlay/030.out new file mode 100644 index 0000000..57ba0cd --- /dev/null +++ b/tests/overlay/030.out @@ -0,0 +1,5 @@ +QA output created by 030 +testing immutable...PASS. +testing append-only...PASS. +testing immutable as non-root...PASS. +testing append-only as non-root...PASS. diff --git a/tests/overlay/group b/tests/overlay/group index 7e72a30..c5048c4 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -32,3 +32,4 @@ 027 auto quick perms 028 auto copyup quick 029 auto quick +030 auto quick perms