c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 10:37:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename acltype=posixacl to acltype=posix

Browse Source 
Prefer acltype=off|posix, retaining the old names as aliases.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #10918
This commit is contained in:
Ryan Moeller
2020-09-16 15:26:06 -04:00
committed by Brian Behlendorf
parent 0968d689a2
commit 2cec08a1f0
15 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/tests/functional/acl/posix/posix_001_pos.ksh
+2 -2
View File
@@ -34,7 +34,7 @@
#
# DESCRIPTION:
# Verify that user can access file/directory if acltype=posixacl.
# Verify that user can access file/directory if acltype=posix.
#
# STRATEGY:
# 1. Test access to file (mode=rw-)
@@ -50,7 +50,7 @@ function cleanup
rmdir $TESTDIR/dir.0
}
log_assert "Verify acltype=posixacl works on file"
log_assert "Verify acltype=posix works on file"
log_onexit cleanup
# Test access to FILE
tests/zfs-tests/tests/functional/acl/posix/posix_002_pos.ksh
+2 -2
View File
@@ -34,7 +34,7 @@
#
# DESCRIPTION:
# Verify that user can access file/directory if acltype=posixacl.
# Verify that user can access file/directory if acltype=posix.
#
# STRATEGY:
# 1. Test access to directory (mode=-wx)
@@ -43,7 +43,7 @@
#
verify_runnable "both"
log_assert "Verify acltype=posixacl works on directory"
log_assert "Verify acltype=posix works on directory"
# Test access to DIRECTORY
log_note "Testing access to DIRECTORY"
tests/zfs-tests/tests/functional/acl/posix/setup.ksh
+1 -1
View File
@@ -46,7 +46,7 @@ default_setup_noexit $DISK
log_must chmod 777 $TESTDIR
# Use POSIX ACLs on filesystem
log_must zfs set acltype=posixacl $TESTPOOL/$TESTFS
log_must zfs set acltype=posix $TESTPOOL/$TESTFS
log_must zfs set xattr=sa $TESTPOOL/$TESTFS
log_pass
tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_021_pos.ksh
+1 -1
View File
@@ -68,7 +68,7 @@ set -A RW_FS_PROP "quota=536870912" \
"setuid=off" \
"readonly=on" \
"snapdir=visible" \
"acltype=posixacl" \
"acltype=posix" \
"aclinherit=discard" \
"canmount=off"
if is_freebsd; then
tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_022_pos.ksh
+1 -1
View File
@@ -68,7 +68,7 @@ set -A RW_FS_PROP "quota=536870912" \
"setuid=off" \
"readonly=on" \
"snapdir=visible" \
"acltype=posixacl" \
"acltype=posix" \
"aclinherit=discard" \
"canmount=off"
tests/zfs-tests/tests/functional/cli_user/misc/misc.cfg
+4 -4
View File
@@ -41,7 +41,7 @@ if is_linux; then
# zfs get/set subcommands - ordered as per the list above so we
# can iterate over both sets in an array
PROP_VALS="\
posixacl on \
posix on \
fletcher2 on on \
on legacy none on \
128K none on \
@@ -49,7 +49,7 @@ if is_linux; then
# these are an alternate set of property values
PROP_ALTVALS="\
noacl off \
off off \
fletcher4 lzjb off \
off /tmp/zfstest 100M off \
512 10m off \
@@ -66,7 +66,7 @@ elif is_freebsd; then
# zfs get/set subcommands - ordered as per the list above so we
# can iterate over both sets in an array
PROP_VALS="\
posixacl on \
posix on \
fletcher2 on on \
on legacy none on \
128K none on \
@@ -74,7 +74,7 @@ elif is_freebsd; then
# these are an alternate set of property values
PROP_ALTVALS="\
noacl off \
off off \
fletcher4 lzjb off \
off /tmp/zfstest 100M off \
512 10m off \
tests/zfs-tests/tests/functional/history/history_002_pos.ksh
+2 -2
View File
@@ -72,8 +72,8 @@ props=(
mountpoint /history.$$ mountpoint legacy
mountpoint none compression lz4
compression on compression off
compression lzjb acltype noacl
acltype posixacl xattr sa
compression lzjb acltype off
acltype posix xattr sa
atime on atime off
devices on devices off
exec on exec off
tests/zfs-tests/tests/functional/rsend/rsend_012_pos.ksh
+1 -1
View File
@@ -116,7 +116,7 @@ for fs in "$POOL" "$POOL/pclone" "$POOL/$FS" "$POOL/$FS/fs1" \
"$POOL/$FS/fs1/fs2" "$POOL/$FS/fs1/fclone" ; do
rand_set_prop $fs aclinherit "discard" "noallow" "secure" "passthrough"
rand_set_prop $fs checksum "on" "off" "fletcher2" "fletcher4" "sha256"
rand_set_prop $fs acltype "off" "noacl" "posixacl"
rand_set_prop $fs acltype "off" "posix" "noacl" "posixacl"
rand_set_prop $fs atime "on" "off"
rand_set_prop $fs checksum "on" "off" "fletcher2" "fletcher4" "sha256"
rand_set_prop $fs compression "${compress_prop_vals[@]}"