From owner-svn-src-vendor@FreeBSD.ORG Mon Nov 19 11:24:39 2012 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 76FE8FD8; Mon, 19 Nov 2012 11:24:39 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 57AED8FC0C; Mon, 19 Nov 2012 11:24:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAJBOd6I042783; Mon, 19 Nov 2012 11:24:39 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAJBOdYs042782; Mon, 19 Nov 2012 11:24:39 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201211191124.qAJBOdYs042782@svn.freebsd.org> From: Martin Matuska Date: Mon, 19 Nov 2012 11:24:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r243267 - vendor-sys/illumos/dist/uts/common/fs/zfs X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Nov 2012 11:24:39 -0000 Author: mm Date: Mon Nov 19 11:24:38 2012 New Revision: 243267 URL: http://svnweb.freebsd.org/changeset/base/243267 Log: Update vendor-sys/illumos/dist to illumos-gate 13888:7204b3392a58 (bugix for illumos zfs issue #3236) Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c Mon Nov 19 11:22:32 2012 (r243266) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c Mon Nov 19 11:24:38 2012 (r243267) @@ -1565,7 +1565,8 @@ dmu_write_policy(objset_t *os, dnode_t * enum zio_checksum checksum = os->os_checksum; enum zio_compress compress = os->os_compress; enum zio_checksum dedup_checksum = os->os_dedup_checksum; - boolean_t dedup, nopwrite; + boolean_t dedup = B_FALSE; + boolean_t nopwrite = B_FALSE; boolean_t dedup_verify = os->os_dedup_verify; int copies = os->os_copies; @@ -1594,9 +1595,6 @@ dmu_write_policy(objset_t *os, dnode_t * if (zio_checksum_table[checksum].ci_correctable < 1 || zio_checksum_table[checksum].ci_eck) checksum = ZIO_CHECKSUM_FLETCHER_4; - - dedup = B_FALSE; - nopwrite = B_FALSE; } else if (wp & WP_NOFILL) { ASSERT(level == 0); @@ -1609,8 +1607,6 @@ dmu_write_policy(objset_t *os, dnode_t * */ compress = ZIO_COMPRESS_OFF; checksum = ZIO_CHECKSUM_OFF; - dedup = B_FALSE; - nopwrite = B_FALSE; } else { compress = zio_compress_select(dn->dn_compress, compress); From owner-svn-src-vendor@FreeBSD.ORG Thu Nov 22 06:45:29 2012 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 40A3AE3E; Thu, 22 Nov 2012 06:45:29 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 086FB8FC0C; Thu, 22 Nov 2012 06:45:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAM6jSZU015345; Thu, 22 Nov 2012 06:45:28 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAM6jSL1015342; Thu, 22 Nov 2012 06:45:28 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201211220645.qAM6jSL1015342@svn.freebsd.org> From: Martin Matuska Date: Thu, 22 Nov 2012 06:45:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r243395 - vendor-sys/illumos/dist/common/zfs vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/man/man1m X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2012 06:45:29 -0000 Author: mm Date: Thu Nov 22 06:45:28 2012 New Revision: 243395 URL: http://svnweb.freebsd.org/changeset/base/243395 Log: Update vendor/illumos/dist and vendor-sys/illumos/dist to illumos-gate 13889:a67716f16746 (illumos zfs issue #3254) Modified: vendor-sys/illumos/dist/common/zfs/zfs_prop.c vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c Changes in other areas also in this revision: Modified: vendor/illumos/dist/man/man1m/zfs.1m Modified: vendor-sys/illumos/dist/common/zfs/zfs_prop.c ============================================================================== --- vendor-sys/illumos/dist/common/zfs/zfs_prop.c Thu Nov 22 05:48:29 2012 (r243394) +++ vendor-sys/illumos/dist/common/zfs/zfs_prop.c Thu Nov 22 06:45:28 2012 (r243395) @@ -109,6 +109,7 @@ zfs_prop_init(void) { "discard", ZFS_ACL_DISCARD }, { "groupmask", ZFS_ACL_GROUPMASK }, { "passthrough", ZFS_ACL_PASSTHROUGH }, + { "restricted", ZFS_ACL_RESTRICTED }, { NULL } }; @@ -217,7 +218,8 @@ zfs_prop_init(void) "hidden | visible", "SNAPDIR", snapdir_table); zprop_register_index(ZFS_PROP_ACLMODE, "aclmode", ZFS_ACL_DISCARD, PROP_INHERIT, ZFS_TYPE_FILESYSTEM, - "discard | groupmask | passthrough", "ACLMODE", acl_mode_table); + "discard | groupmask | passthrough | restricted", "ACLMODE", + acl_mode_table); zprop_register_index(ZFS_PROP_ACLINHERIT, "aclinherit", ZFS_ACL_RESTRICTED, PROP_INHERIT, ZFS_TYPE_FILESYSTEM, "discard | noallow | restricted | passthrough | passthrough-x", Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c Thu Nov 22 05:48:29 2012 (r243394) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c Thu Nov 22 06:45:28 2012 (r243395) @@ -2982,6 +2982,12 @@ top: uint64_t acl_obj; new_mode = (pmode & S_IFMT) | (vap->va_mode & ~S_IFMT); + if (zp->z_zfsvfs->z_acl_mode == ZFS_ACL_RESTRICTED && + !(zp->z_pflags & ZFS_ACL_TRIVIAL)) { + err = EPERM; + goto out; + } + if (err = zfs_acl_chmod_setattr(zp, &aclp, new_mode)) goto out; From owner-svn-src-vendor@FreeBSD.ORG Thu Nov 22 06:45:29 2012 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 539C4E3F; Thu, 22 Nov 2012 06:45:29 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 356A18FC13; Thu, 22 Nov 2012 06:45:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAM6jTXe015351; Thu, 22 Nov 2012 06:45:29 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAM6jTaX015350; Thu, 22 Nov 2012 06:45:29 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201211220645.qAM6jTaX015350@svn.freebsd.org> From: Martin Matuska Date: Thu, 22 Nov 2012 06:45:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r243395 - vendor-sys/illumos/dist/common/zfs vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/man/man1m X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2012 06:45:29 -0000 Author: mm Date: Thu Nov 22 06:45:28 2012 New Revision: 243395 URL: http://svnweb.freebsd.org/changeset/base/243395 Log: Update vendor/illumos/dist and vendor-sys/illumos/dist to illumos-gate 13889:a67716f16746 (illumos zfs issue #3254) Modified: vendor/illumos/dist/man/man1m/zfs.1m Changes in other areas also in this revision: Modified: vendor-sys/illumos/dist/common/zfs/zfs_prop.c vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c Modified: vendor/illumos/dist/man/man1m/zfs.1m ============================================================================== --- vendor/illumos/dist/man/man1m/zfs.1m Thu Nov 22 05:48:29 2012 (r243394) +++ vendor/illumos/dist/man/man1m/zfs.1m Thu Nov 22 06:45:28 2012 (r243395) @@ -830,7 +830,7 @@ mode from the application. .sp .ne 2 .na -\fB\fBaclmode\fR=\fBdiscard\fR | \fBgroupmask\fR | \fBpassthrough\fR\fR +\fB\fBaclmode\fR=\fBdiscard\fR | \fBgroupmask\fR | \fBpassthrough\fR\fR | \fBrestricted\fR\fR .ad .sp .6 .RS 4n @@ -839,10 +839,18 @@ an \fBaclmode\fR property of \fBdiscard\ entries that do not represent the mode of the file. An \fBaclmode\fR property of \fBgroupmask\fR reduces permissions granted in all \fBALLOW\fR entries found in the \fBACL\fR such that they are no greater than the group permissions -specified by \fBchmod\fR. A file system with an \fBaclmode\fR property of +specified by \fBchmod\fR(2). A file system with an \fBaclmode\fR property of \fBpassthrough\fR indicates that no changes are made to the \fBACL\fR other -than creating or updating the necessary \fBACL\fR entries to -represent the new mode of the file or directory. +than creating or updating the necessary \fBACL\fR entries to represent the new +mode of the file or directory. An \fBaclmode\fR property of \fBrestricted\fR +will cause the \fBchmod\fR(2) operation to return an error when used on any +file or directory which has a non-trivial \fBACL\fR whose entries can not be +represented by a mode. \fBchmod\fR(2) is required to change the set user ID, +set group ID, or sticky bits on a file or directory, as they do not have +equivalent \fBACL\fR entries. In order to use \fBchmod\fR(2) on a file or +directory with a non-trivial \fBACL\fR when \fBaclmode\fR is set to +\fBrestricted\fR, you must first remove all \fBACL\fR entries which do not +represent the current mode. .RE .sp @@ -3939,7 +3947,7 @@ Interface Stability Committed \fBssh\fR(1), \fBiscsitadm\fR(1M), \fBmount\fR(1M), \fBshare\fR(1M), \fBsharemgr\fR(1M), \fBunshare\fR(1M), \fBzonecfg\fR(1M), \fBzpool\fR(1M), \fBchmod\fR(2), \fBstat\fR(2), \fBwrite\fR(2), \fBfsync\fR(3C), -\fBdfstab\fR(4), \fBattributes\fR(5) +\fBdfstab\fR(4), \fBacl\fR(5), \fBattributes\fR(5) .sp .LP See the \fBgzip\fR(1) man page, which is not part of the SunOS man page