| Message ID | 1381938761-31625-1-git-send-email-fdmanana@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 10/16/13 10:52 AM, Filipe David Borba Manana wrote: > 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 <fdmanana@gmail.com> > --- > > V2: Moved the regression test into a dedicated and new file, as suggested > by Eric Sandeen. Great, thanks. Verified that it succeeds on xfs & ext3 as well. It also fails properly when mounting ext3 -o noacl: shared/052 1s ... [not run] ACLs not supported by this filesystem type: ext3 ... > +# real QA test starts here > +_supported_os Linux Technically this should have a: +_supported_fs generic here. And then it can move to tests/generic/xxx (I guess that's a little odd and redundant, and it does run today w/o the _supported_fs, I guess, but still best to be consistent). Sorry for the runaround :) If you don't mind a V3, we'll be done, I think! -Eric -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Oct 16, 2013 at 5:09 PM, Eric Sandeen <sandeen@sandeen.net> wrote: > On 10/16/13 10:52 AM, Filipe David Borba Manana wrote: >> 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 <fdmanana@gmail.com> >> --- >> >> V2: Moved the regression test into a dedicated and new file, as suggested >> by Eric Sandeen. > > Great, thanks. Verified that it succeeds on xfs & ext3 as well. > > It also fails properly when mounting ext3 -o noacl: > > shared/052 1s ... [not run] ACLs not supported by this filesystem type: ext3 > > ... > >> +# real QA test starts here >> +_supported_os Linux > > Technically this should have a: > > +_supported_fs generic > > here. And then it can move to tests/generic/xxx > > (I guess that's a little odd and redundant, and it does > run today w/o the _supported_fs, I guess, but still > best to be consistent). > > Sorry for the runaround :) > > If you don't mind a V3, we'll be done, I think! Np. Is there any rule as for which name (number) to pick for the test case file name? > > -Eric >
On 10/16/13 11:11 AM, Filipe David Manana wrote: > On Wed, Oct 16, 2013 at 5:09 PM, Eric Sandeen <sandeen@sandeen.net> wrote: >> On 10/16/13 10:52 AM, Filipe David Borba Manana wrote: >>> 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 <fdmanana@gmail.com> >>> --- >>> >>> V2: Moved the regression test into a dedicated and new file, as suggested >>> by Eric Sandeen. >> >> Great, thanks. Verified that it succeeds on xfs & ext3 as well. >> >> It also fails properly when mounting ext3 -o noacl: >> >> shared/052 1s ... [not run] ACLs not supported by this filesystem type: ext3 >> >> ... >> >>> +# real QA test starts here >>> +_supported_os Linux >> >> Technically this should have a: >> >> +_supported_fs generic >> >> here. And then it can move to tests/generic/xxx >> >> (I guess that's a little odd and redundant, and it does >> run today w/o the _supported_fs, I guess, but still >> best to be consistent). >> >> Sorry for the runaround :) >> >> If you don't mind a V3, we'll be done, I think! > > Np. > Is there any rule as for which name (number) to pick for the test case > file name? just pick a free slot. SGI is behind on merging, so they may need to move it to avoid a conflict. Wish we had a little better way to do this... hch just chimed in, maybe we can tweak the original 051 test to do the same testing on other filesystems, if we can set the appropriate max acl counts... but that's another patch. -Eric >> >> -Eric >> > > > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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
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 <fdmanana@gmail.com> --- 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