PERFORCE change 189524 for review
Matt Jacob
mjacob at FreeBSD.org
Sat Mar 5 00:41:02 UTC 2011
http://p4web.freebsd.org/@@189524?ac=10
Change 189524 by mjacob at mjacob-sandbox on 2011/03/05 00:40:24
MFHead
Affected files ...
.. //depot/projects/mjacob-dev/include/limits.h#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/posix1e/acl_strip.c#2 integrate
.. //depot/projects/mjacob-dev/share/man/man4/run.4#3 integrate
.. //depot/projects/mjacob-dev/sys/cam/cam_periph.c#3 integrate
.. //depot/projects/mjacob-dev/sys/compat/linux/linux_futex.c#3 integrate
.. //depot/projects/mjacob-dev/sys/dev/ath/ath_rate/sample/sample.c#5 integrate
.. //depot/projects/mjacob-dev/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/mjacob-dev/sys/dev/usb/wlan/if_run.c#4 integrate
.. //depot/projects/mjacob-dev/sys/kern/subr_acl_nfs4.c#3 integrate
.. //depot/projects/mjacob-dev/sys/kern/sys_capability.c#2 integrate
.. //depot/projects/mjacob-dev/sys/net/if_lagg.c#2 integrate
.. //depot/projects/mjacob-dev/sys/security/mac/mac_syscalls.c#3 integrate
.. //depot/projects/mjacob-dev/sys/sys/limits.h#2 integrate
.. //depot/projects/mjacob-dev/sys/ufs/ffs/ffs_alloc.c#3 integrate
.. //depot/projects/mjacob-dev/tools/regression/acltools/00.t#2 integrate
.. //depot/projects/mjacob-dev/tools/regression/acltools/01.t#2 integrate
.. //depot/projects/mjacob-dev/tools/regression/acltools/02.t#3 integrate
.. //depot/projects/mjacob-dev/tools/regression/acltools/03.t#2 integrate
.. //depot/projects/mjacob-dev/tools/regression/acltools/tools-crossfs.test#2 integrate
Differences ...
==== //depot/projects/mjacob-dev/include/limits.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)limits.h 8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/include/limits.h,v 1.18 2010/08/29 22:22:15 jilles Exp $
+ * $FreeBSD: src/include/limits.h,v 1.20 2011/03/04 19:28:27 jilles Exp $
*/
#ifndef _LIMITS_H_
@@ -37,18 +37,27 @@
#if __POSIX_VISIBLE
#define _POSIX_ARG_MAX 4096
-#define _POSIX_CHILD_MAX 25
#define _POSIX_LINK_MAX 8
#define _POSIX_MAX_CANON 255
#define _POSIX_MAX_INPUT 255
#define _POSIX_NAME_MAX 14
+#define _POSIX_PIPE_BUF 512
+#define _POSIX_SSIZE_MAX 32767
+#define _POSIX_STREAM_MAX 8
+
+#if __POSIX_VISIBLE >= 200112
+#define _POSIX_CHILD_MAX 25
#define _POSIX_NGROUPS_MAX 8
#define _POSIX_OPEN_MAX 20
#define _POSIX_PATH_MAX 256
-#define _POSIX_PIPE_BUF 512
-#define _POSIX_SSIZE_MAX 32767
-#define _POSIX_STREAM_MAX 8
#define _POSIX_TZNAME_MAX 6
+#else
+#define _POSIX_CHILD_MAX 6
+#define _POSIX_NGROUPS_MAX 0
+#define _POSIX_OPEN_MAX 16
+#define _POSIX_PATH_MAX 255
+#define _POSIX_TZNAME_MAX 3
+#endif
#define BC_BASE_MAX 99 /* max ibase/obase values in bc(1) */
#define BC_DIM_MAX 2048 /* max array elements in bc(1) */
@@ -80,6 +89,8 @@
#define _POSIX_SEM_VALUE_MAX 32767
#define _POSIX_SIGQUEUE_MAX 32
#define _POSIX_TIMER_MAX 32
+
+#define _POSIX_CLOCKRES_MIN 20000000
#endif
#if __POSIX_VISIBLE >= 199506
@@ -105,18 +116,21 @@
#define _POSIX_RE_DUP_MAX _POSIX2_RE_DUP_MAX
#endif
+#if __XSI_VISIBLE || __POSIX_VISIBLE >= 200809
+#define NL_ARGMAX 99 /* max # of position args for printf */
+#define NL_MSGMAX 32767
+#define NL_SETMAX 255
+#define NL_TEXTMAX 2048
+#endif
+
#if __XSI_VISIBLE
#define _XOPEN_IOV_MAX 16
#define _XOPEN_NAME_MAX 255
#define _XOPEN_PATH_MAX 1024
#define PASS_MAX 128 /* _PASSWORD_LEN from <pwd.h> */
-#define NL_ARGMAX 99 /* max # of position args for printf */
#define NL_LANGMAX 31 /* max LANG name length */
-#define NL_MSGMAX 32767
#define NL_NMAX 1
-#define NL_SETMAX 255
-#define NL_TEXTMAX 2048
#endif
#define MB_LEN_MAX 6 /* 31-bit UTF-8 */
==== //depot/projects/mjacob-dev/lib/libc/posix1e/acl_strip.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_strip.c,v 1.7 2010/09/20 17:10:06 trasz Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_strip.c,v 1.8 2011/03/04 17:23:10 trasz Exp $");
#include <errno.h>
#include <stdio.h>
@@ -141,7 +141,7 @@
{
switch (_acl_brand(aclp)) {
case ACL_BRAND_NFS4:
- return (_nfs4_acl_strip_np(aclp, 1));
+ return (_nfs4_acl_strip_np(aclp, 0));
case ACL_BRAND_POSIX:
return (_posix1e_acl_strip_np(aclp, recalculate_mask));
==== //depot/projects/mjacob-dev/share/man/man4/run.4#3 (text+ko) ====
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $FreeBSD: src/share/man/man4/run.4,v 1.5 2011/01/11 21:51:46 thompsa Exp $
+.\" $FreeBSD: src/share/man/man4/run.4,v 1.6 2011/03/04 07:01:45 daichi Exp $
.\"
.Dd January 12, 2011
.Dt RUN 4
@@ -120,6 +120,7 @@
.It Belkin F6D4050 ver 1
.It Buffalo WLI-UC-AG300N
.It Buffalo WLI-UC-G300N
+.It Buffalo WLI-UC-G301N
.It Buffalo WLI-UC-GN
.It Corega CG-WLUSB2GNL
.It Corega CG-WLUSB2GNR
==== //depot/projects/mjacob-dev/sys/cam/cam_periph.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.93 2011/01/11 13:59:06 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.94 2011/03/03 18:28:21 mjacob Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1560,6 +1560,15 @@
case SS_START:
{
int le;
+ if (SID_TYPE(&cgd.inq_data) == T_SEQUENTIAL) {
+ xpt_free_ccb(orig_ccb);
+ ccb->ccb_h.status |= CAM_DEV_QFRZN;
+ *action_string = "Will not autostart a "
+ "sequential access device";
+ err_action = SS_FAIL;
+ error = EIO;
+ break;
+ }
/*
* Send a start unit command to the device, and
==== //depot/projects/mjacob-dev/sys/compat/linux/linux_futex.c#3 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.38 2011/02/23 13:23:28 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.40 2011/03/03 18:29:55 dchagin Exp $");
#if 0
__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $");
#endif
@@ -137,16 +137,16 @@
FUTEXES_UNLOCK;
FUTEX_UNLOCK(f);
- LINUX_CTR2(sys_futex, "futex_put destroy uaddr %p ref %d",
- f->f_uaddr, f->f_refcount);
+ LINUX_CTR3(sys_futex, "futex_put destroy uaddr %p ref %d "
+ "shared %d", f->f_uaddr, f->f_refcount, f->f_key.shared);
umtx_key_release(&f->f_key);
FUTEX_DESTROY(f);
free(f, M_FUTEX);
return;
}
- LINUX_CTR2(sys_futex, "futex_put uaddr %p ref %d",
- f->f_uaddr, f->f_refcount);
+ LINUX_CTR3(sys_futex, "futex_put uaddr %p ref %d shared %d",
+ f->f_uaddr, f->f_refcount, f->f_key.shared);
FUTEXES_UNLOCK;
FUTEX_UNLOCK(f);
}
@@ -161,7 +161,7 @@
*newf = tmpf = NULL;
error = umtx_key_get(uaddr, TYPE_FUTEX, (flags & FUTEX_SHARED) ?
- PROCESS_SHARE : THREAD_SHARE, &key);
+ AUTO_SHARE : THREAD_SHARE, &key);
if (error)
return (error);
retry:
@@ -189,8 +189,8 @@
FUTEX_LOCK(f);
*newf = f;
- LINUX_CTR2(sys_futex, "futex_get uaddr %p ref %d",
- uaddr, f->f_refcount);
+ LINUX_CTR3(sys_futex, "futex_get uaddr %p ref %d shared %d",
+ uaddr, f->f_refcount, f->f_key.shared);
return (0);
}
}
@@ -223,8 +223,8 @@
LIST_INSERT_HEAD(&futex_list, tmpf, f_list);
FUTEXES_UNLOCK;
- LINUX_CTR2(sys_futex, "futex_get uaddr %p ref %d new",
- uaddr, tmpf->f_refcount);
+ LINUX_CTR3(sys_futex, "futex_get uaddr %p ref %d shared %d new",
+ uaddr, tmpf->f_refcount, tmpf->f_key.shared);
*newf = tmpf;
return (0);
}
==== //depot/projects/mjacob-dev/sys/dev/ath/ath_rate/sample/sample.c#5 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.36 2011/03/03 08:09:49 adrian Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.37 2011/03/03 20:41:59 adrian Exp $");
/*
* John Bicket's SampleRate control algorithm.
@@ -273,6 +273,7 @@
goto done;
}
+ /* XXX TODO: this doesn't know about 11gn vs 11g protection; teach it */
mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT);
best_rix = pick_best_rate(sn, rt, size_bin, !mrr);
==== //depot/projects/mjacob-dev/sys/dev/usb/usbdevs#4 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.506 2011/02/24 09:13:47 hselasky Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.507 2011/03/04 07:01:45 daichi Exp $
/* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
/*-
@@ -2157,6 +2157,7 @@
product MELCO RT2870_1 0x0148 RT2870
product MELCO RT2870_2 0x0150 RT2870
product MELCO WLIUCGN 0x015d WLI-UC-GN
+product MELCO WLIUCG301N 0x016f WLI-UC-G301N
/* Merlin products */
product MERLIN V620 0x1110 Merlin V620
==== //depot/projects/mjacob-dev/sys/dev/usb/wlan/if_run.c#4 (text+ko) ====
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_run.c,v 1.20 2011/02/14 08:14:06 hselasky Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_run.c,v 1.21 2011/03/04 07:01:45 daichi Exp $");
/*-
* Ralink Technology RT2700U/RT2800U/RT3000U chipset driver.
@@ -210,6 +210,7 @@
RUN_DEV(MELCO, RT2870_2),
RUN_DEV(MELCO, WLIUCAG300N),
RUN_DEV(MELCO, WLIUCG300N),
+ RUN_DEV(MELCO, WLIUCG301N),
RUN_DEV(MELCO, WLIUCGN),
RUN_DEV(MOTOROLA4, RT2770),
RUN_DEV(MOTOROLA4, RT3070),
==== //depot/projects/mjacob-dev/sys/kern/subr_acl_nfs4.c#3 (text+ko) ====
@@ -32,7 +32,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_acl_nfs4.c,v 1.11 2010/12/13 18:56:04 trasz Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_acl_nfs4.c,v 1.12 2011/03/04 19:53:07 trasz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,12 +55,12 @@
#endif /* !_KERNEL */
-static int acl_nfs4_old_semantics = 1;
+static int acl_nfs4_old_semantics = 0;
#ifdef _KERNEL
SYSCTL_INT(_vfs, OID_AUTO, acl_nfs4_old_semantics, CTLFLAG_RW,
- &acl_nfs4_old_semantics, 1, "Use pre-PSARC/2010/029 NFSv4 ACL semantics");
+ &acl_nfs4_old_semantics, 0, "Use pre-PSARC/2010/029 NFSv4 ACL semantics");
static struct {
accmode_t accmode;
==== //depot/projects/mjacob-dev/sys/kern/sys_capability.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
#include "opt_capabilities.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sys_capability.c,v 1.1 2011/03/01 13:23:37 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sys_capability.c,v 1.2 2011/03/04 09:03:54 netchild Exp $");
#include <sys/param.h>
#include <sys/capability.h>
@@ -61,6 +61,8 @@
#ifdef CAPABILITIES
+FEATURE(security_capabilities, "Capsicum Capability Mode");
+
/*
* We don't currently have any MIB entries for sysctls, but we do expose
* security.capabilities so that it's easy to tell if options CAPABILITIES is
==== //depot/projects/mjacob-dev/sys/net/if_lagg.c#2 (text+ko) ====
@@ -341,7 +341,8 @@
while ((lp = SLIST_FIRST(&sc->sc_ports)) != NULL)
lagg_port_destroy(lp, 1);
/* Unhook the aggregation protocol */
- (*sc->sc_detach)(sc);
+ if (sc->sc_detach != NULL)
+ (*sc->sc_detach)(sc);
LAGG_WUNLOCK(sc);
==== //depot/projects/mjacob-dev/sys/security/mac/mac_syscalls.c#3 (text+ko) ====
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/security/mac/mac_syscalls.c,v 1.140 2011/02/25 10:11:01 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_syscalls.c,v 1.141 2011/03/04 09:03:54 netchild Exp $");
#include "opt_mac.h"
@@ -73,7 +73,7 @@
#ifdef MAC
-FEATURE(mac, "Mandatory Access Control Framework support");
+FEATURE(security_mac, "Mandatory Access Control Framework support");
int
__mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
==== //depot/projects/mjacob-dev/sys/sys/limits.h#2 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/sys/limits.h,v 1.10 2005/12/02 07:45:28 davidxu Exp $
+ * $FreeBSD: src/sys/sys/limits.h,v 1.11 2011/03/04 19:28:27 jilles Exp $
*/
#ifndef _SYS_LIMITS_H_
@@ -88,7 +88,7 @@
#define QUAD_MIN (__QUAD_MIN) /* min value for a quad_t */
#endif
-#if __XSI_VISIBLE
+#if __XSI_VISIBLE || __POSIX_VISIBLE >= 200809
#define LONG_BIT __LONG_BIT
#define WORD_BIT __WORD_BIT
#endif
==== //depot/projects/mjacob-dev/sys/ufs/ffs/ffs_alloc.c#3 (text+ko) ====
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.160 2010/12/29 12:25:28 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.161 2011/03/04 22:26:41 jhb Exp $");
#include "opt_quota.h"
@@ -1782,17 +1782,13 @@
}
}
i = start + len - loc;
- map = inosused[i];
- ipref = i * NBBY;
- for (i = 1; i < (1 << NBBY); i <<= 1, ipref++) {
- if ((map & i) == 0) {
- cgp->cg_irotor = ipref;
- goto gotit;
- }
+ map = inosused[i] ^ 0xff;
+ if (map == 0) {
+ printf("fs = %s\n", fs->fs_fsmnt);
+ panic("ffs_nodealloccg: block not in map");
}
- printf("fs = %s\n", fs->fs_fsmnt);
- panic("ffs_nodealloccg: block not in map");
- /* NOTREACHED */
+ ipref = i * NBBY + ffs(map) - 1;
+ cgp->cg_irotor = ipref;
gotit:
/*
* Check to see if we need to initialize more inodes.
==== //depot/projects/mjacob-dev/tools/regression/acltools/00.t#2 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/tools/regression/acltools/00.t,v 1.3 2009/09/23 15:12:20 trasz Exp $
+# $FreeBSD: src/tools/regression/acltools/00.t,v 1.4 2011/03/04 17:07:02 trasz Exp $
#
# This is a wrapper script to run tools-posix.test on UFS filesystem.
@@ -44,7 +44,7 @@
exit 1
fi
-TESTDIR=`dirname $0`
+TESTDIR=$(dirname $(realpath $0))
# Set up the test filesystem.
MD=`mdconfig -at swap -s 10m`
==== //depot/projects/mjacob-dev/tools/regression/acltools/01.t#2 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/tools/regression/acltools/01.t,v 1.1 2009/09/07 16:26:03 trasz Exp $
+# $FreeBSD: src/tools/regression/acltools/01.t,v 1.3 2011/03/04 17:10:39 trasz Exp $
#
# This is a wrapper script to run tools-nfs4.test on ZFS filesystem.
@@ -46,7 +46,7 @@
exit 1
fi
-TESTDIR=`dirname $0`
+TESTDIR=$(dirname $(realpath $0))
# Set up the test filesystem.
MD=`mdconfig -at swap -s 64m`
@@ -64,13 +64,13 @@
# First, check whether we can crash the kernel by creating too many
# entries. For some reason this won't work in the test file.
touch xxx
-setfacl -x5 xxx
+setfacl -x2 xxx
while :; do setfacl -a0 u:42:rwx:allow xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done
chmod 600 xxx
rm xxx
echo "ok 2"
-perl $TESTDIR/run $TESTDIR/tools-nfs4.test > /dev/null
+perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test > /dev/null
if [ $? -eq 0 ]; then
echo "ok 3"
==== //depot/projects/mjacob-dev/tools/regression/acltools/02.t#3 (text+ko) ====
@@ -24,10 +24,10 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/tools/regression/acltools/02.t,v 1.2 2010/12/13 18:59:55 trasz Exp $
+# $FreeBSD: src/tools/regression/acltools/02.t,v 1.4 2011/03/04 18:46:19 trasz Exp $
#
-# This is a wrapper script to run tools-nfs4.test.
+# This is a wrapper script to run tools-nfs4.test on UFS filesystem.
#
# If any of the tests fails, here is how to debug it: go to
# the directory with problematic filesystem mounted on it,
@@ -44,7 +44,7 @@
exit 1
fi
-TESTDIR=`dirname $0`
+TESTDIR=$(dirname $(realpath $0))
# Set up the test filesystem.
MD=`mdconfig -at swap -s 10m`
@@ -63,7 +63,7 @@
# First, check whether we can crash the kernel by creating too many
# entries. For some reason this won't work in the test file.
touch xxx
-setfacl -x5 xxx
+setfacl -x2 xxx
while :; do setfacl -a0 u:42:rwx:allow xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done
chmod 600 xxx
rm xxx
==== //depot/projects/mjacob-dev/tools/regression/acltools/03.t#2 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/tools/regression/acltools/03.t,v 1.1 2009/09/23 15:12:20 trasz Exp $
+# $FreeBSD: src/tools/regression/acltools/03.t,v 1.2 2011/03/04 17:07:02 trasz Exp $
#
# This is a wrapper script to run tools-crossfs.test between UFS without
@@ -41,7 +41,7 @@
exit 1
fi
-TESTDIR=`dirname $0`
+TESTDIR=$(dirname $(realpath $0))
MNTROOT=`mktemp -dt acltools`
# Set up the test filesystems.
==== //depot/projects/mjacob-dev/tools/regression/acltools/tools-crossfs.test#2 (text+ko) ====
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/tools/regression/acltools/tools-crossfs.test,v 1.2 2009/12/27 13:05:56 trasz Exp $
+# $FreeBSD: src/tools/regression/acltools/tools-crossfs.test,v 1.3 2011/03/04 18:37:26 trasz Exp $
#
# This is a tools-level test intended to verify that cp(1) and mv(1)
@@ -43,11 +43,8 @@
$ touch nfs4/xxx
$ getfacl -nq nfs4/xxx
-> owner@:--x-----------:------:deny
-> owner@:rw-p---A-W-Co-:------:allow
-> group@:-wxp----------:------:deny
-> group@:r-------------:------:allow
-> everyone@:-wxp---A-W-Co-:------:deny
+> owner@:rw-p--aARWcCos:------:allow
+> group@:r-----a-R-c--s:------:allow
> everyone@:r-----a-R-c--s:------:allow
$ touch posix/xxx
@@ -100,10 +97,8 @@
> mv: failed to set acl entries for nfs4/xxx: Invalid argument
$ getfacl -nq nfs4/xxx
> owner@:-wxp----------:------:deny
-> owner@:r------A-W-Co-:------:allow
-> group@:--------------:------:deny
-> group@:rwxp----------:------:allow
-> everyone@:--x----A-W-Co-:------:deny
+> owner@:r-----aARWcCos:------:allow
+> group@:rwxp--a-R-c--s:------:allow
> everyone@:rw-p--a-R-c--s:------:allow
$ ls -l nfs4/xxx | cut -d' ' -f1
> -r--rwxrw-
@@ -117,11 +112,8 @@
$ getfacl -nq nfs4/yyy
> user:42:--x-----------:------:allow
> group:43:-w------------:------:allow
-> owner@:--x-----------:------:deny
-> owner@:rw-p---A-W-Co-:------:allow
-> group@:-wxp----------:------:deny
-> group@:r-------------:------:allow
-> everyone@:-wxp---A-W-Co-:------:deny
+> owner@:rw-p--aARWcCos:------:allow
+> group@:r-----a-R-c--s:------:allow
> everyone@:r-----a-R-c--s:------:allow
$ ls -l nfs4/yyy | cut -d' ' -f1
> -rw-r--r--+
@@ -271,11 +263,11 @@
$ getfacl -nq nfs4/yyy
> user:42:--x-----------:------:allow
> group:43:-w------------:------:allow
+> owner@:--x-----------:------:allow
> owner@:-w-p----------:------:deny
-> owner@:r-x----A-W-Co-:------:allow
> group@:-wxp----------:------:deny
-> group@:r-------------:------:allow
-> everyone@:r------A-W-Co-:------:deny
+> owner@:r-x---aARWcCos:------:allow
+> group@:r-----a-R-c--s:------:allow
> everyone@:-wxp--a-R-c--s:------:allow
$ ls -l nfs4/yyy | cut -d' ' -f1
> -r-xr---wx+
More information about the p4-projects
mailing list