From patchwork Wed Oct 16 15:52:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 3054181 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DA8609F243 for ; Wed, 16 Oct 2013 15:53:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 140FB2047E for ; Wed, 16 Oct 2013 15:52:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C250020459 for ; Wed, 16 Oct 2013 15:52:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759731Ab3JPPwx (ORCPT ); Wed, 16 Oct 2013 11:52:53 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:63849 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759264Ab3JPPww (ORCPT ); Wed, 16 Oct 2013 11:52:52 -0400 Received: by mail-wg0-f52.google.com with SMTP id f12so919890wgh.31 for ; Wed, 16 Oct 2013 08:52:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NnJTA4PxV/Ewn6WGOoAxNa3TG4sBxLXsdcEUXX3eKPk=; b=t8zqgkCk5W81AErnxGVxmhwRkO8Lfd6IrbROckPUp8OdDPyX1p+fb3KLgnCWhGqHBO sYX3f9hBmY4yVp7M+h1ZIleTJYkkpRdeOHG9fGXurnXOBHRCnumKnITI3wjb5pouA026 f4yC8p1b72hNYiD8qhArLXen3el8+gwCbMiPiLwhmWHGDkOOvLfIZ7nQrLh/q82g19jZ q8MIe2tz5Ilq7bwSJIi8ae7NGqAP1hEAjggFkESOwZMb4eECuu9GzNfwaeBhkEtnhYJo w+9x0tBkfMNYioLHY4ihsMT1arWk80MH4S4f3BRHjafYHt/XErY0PdkMbbtpnd1ApcjX npug== X-Received: by 10.194.118.169 with SMTP id kn9mr1187356wjb.71.1381938770679; Wed, 16 Oct 2013 08:52:50 -0700 (PDT) Received: from storm-desktop.lan (bl5-77-122.dsl.telepac.pt. [82.154.77.122]) by mx.google.com with ESMTPSA id pi6sm7138693wic.3.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 16 Oct 2013 08:52:50 -0700 (PDT) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org, xfs@oss.sgi.com Cc: jbacik@fusionio.com, dsterba@suse.cz, sandeen@sandeen.net, Filipe David Borba Manana Subject: [PATCH v2] xfstests: add specific test for default ACL inheritance Date: Wed, 16 Oct 2013 16:52:41 +0100 Message-Id: <1381938761-31625-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1381932296-14674-1-git-send-email-fdmanana@gmail.com> References: <1381932296-14674-1-git-send-email-fdmanana@gmail.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This test is motivated by an issue found by a btrfs user, addressed and described by the following GNU/Linux kernel patch: https://patchwork.kernel.org/patch/3046931/ The steps to reproduce the issue on btrfs are the following: $ mkfs.btrfs -f /dev/loop0 $ mount /dev/loop0 /mnt $ mkdir /mnt/acl $ setfacl -d --set u::rwx,g::rwx,o::- /mnt/acl $ getfacl /mnt/acl user::rwx group::rwx other::r-x default:user::rwx default:group::rwx default:other::--- $ mkdir /mnt/acl/dir1 $ getfacl /mnt/acl/dir1 user::rwx group::rwx other::--- After unmounting and mounting again the filesystem, getfacl returned the expected default ACL for the subdirectory: $ umount /mnt/acl $ mount /dev/loop0 /mnt $ getfacl /mnt/acl/dir1 user::rwx group::rwx other::--- default:user::rwx default:group::rwx default:other::--- This means that the underlying ACL xattr was persisted correctly but the in memory representation of the inode had (incorrectly) a NULL ACL. Signed-off-by: Filipe David Borba Manana --- V2: Moved the regression test into a dedicated and new file, as suggested by Eric Sandeen. tests/shared/052 | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/shared/052.out | 21 +++++++++++++++ tests/shared/group | 1 + 3 files changed, 92 insertions(+) create mode 100755 tests/shared/052 create mode 100644 tests/shared/052.out diff --git a/tests/shared/052 b/tests/shared/052 new file mode 100755 index 0000000..ee08eda --- /dev/null +++ b/tests/shared/052 @@ -0,0 +1,70 @@ +#! /bin/bash +# FS QA Test No. shared/052 +# +# Regression test to make sure a directory inherits the default ACL from +# its parent directory. This test was motivated by an issue reported by +# a btrfs user. That issue is fixed and described by the following btrfs +# kernel patch: +# +# https://patchwork.kernel.org/patch/3046931/ +# +#----------------------------------------------------------------------- +# Copyright (c) 2013 Filipe Manana. All Rights Reserved. +# +# 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` +tmp=/tmp/$$ +status=1 # FAILure is the default! + +_cleanup() +{ + rm -f $tmp.* +} + +trap "_cleanup ; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/attr + +# real QA test starts here +_supported_os Linux +_require_acls +_require_scratch +_need_to_be_root + +rm -f $seqres.full + +_scratch_mkfs > /dev/null 2>&1 +_scratch_mount + +mkdir $SCRATCH_MNT/testdir +setfacl -d --set u::rwx,g::rwx,o::- $SCRATCH_MNT/testdir +getfacl --absolute-names $SCRATCH_MNT/testdir | _filter_scratch + +mkdir $SCRATCH_MNT/testdir/testsubdir +getfacl --absolute-names $SCRATCH_MNT/testdir/testsubdir | _filter_scratch + +# success, all done +status=0 +exit diff --git a/tests/shared/052.out b/tests/shared/052.out new file mode 100644 index 0000000..d453175 --- /dev/null +++ b/tests/shared/052.out @@ -0,0 +1,21 @@ +QA output created by 052 +# file: SCRATCH_MNT/testdir +# owner: root +# group: root +user::rwx +group::r-x +other::r-x +default:user::rwx +default:group::rwx +default:other::--- + +# file: SCRATCH_MNT/testdir/testsubdir +# owner: root +# group: root +user::rwx +group::rwx +other::--- +default:user::rwx +default:group::rwx +default:other::--- + diff --git a/tests/shared/group b/tests/shared/group index 0ad640b..91cb049 100644 --- a/tests/shared/group +++ b/tests/shared/group @@ -5,6 +5,7 @@ # 032 mkfs auto quick 051 acl udf auto quick +052 acl auto quick 218 auto fsr quick 243 auto quick prealloc 272 auto enospc rw