PERFORCE change 162579 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Sat May 23 16:18:40 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=162579
Change 162579 by trasz at trasz_victim on 2009/05/23 16:18:21
IFC.
Affected files ...
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl.3#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_add_perm.3#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get.3#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set.3#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_tag_type.3#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/boot/zfs/zfssubr.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/opencrypto/cryptodev.c#3 integrate
Differences ...
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl.3#4 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.22 2003/02/06 11:04:46 charnier Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.23 2009/05/23 13:51:05 trasz Exp $
.\"
.Dd December 18, 2002
.Dt ACL 3
@@ -48,7 +48,7 @@
and validate ACLs associated with file objects.
As well as the POSIX.1e routines, there are a number of non-portable
extensions defined that allow for alternative ACL semantics than the
-POSIX.1e semantics, such as NFS4, AFS, NTFS, Coda, and NWFS semantics.
+POSIX.1e semantics, such as NFSv4, AFS, NTFS, Coda, and NWFS semantics.
Where routines are non-standard, they are suffixed with _np to indicate that
they are not portable.
.Pp
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_add_perm.3#4 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/acl_add_perm.3,v 1.7 2008/11/04 00:20:43 imp Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/acl_add_perm.3,v 1.8 2009/05/23 13:51:05 trasz Exp $
.\"
.Dd March 10, 2001
.Dt ACL_ADD_PERM 3
@@ -52,32 +52,32 @@
.Pp
For POSIX.1e ACLs, valid values are:
.Pp
-.Bd -literal -offset indent -compact
-ACL_EXECUTE Execute permission.
-ACL_WRITE Write permission.
-ACL_READ Read permission.
-.Ed
+.Bl -column -offset 3n "ACL_WRITE_NAMED_ATTRS"
+.It ACL_EXECUTE Execute permission
+.It ACL_WRITE Write permission
+.It ACL_READ Read permission
+.El
.Pp
For NFS4 ACLs, valid values are:
.Pp
-.Bd -literal -offset indent -compact
-ACL_READ_DATA Read permission.
-ACL_LIST_DIRECTORY Same as ACL_READ_DATA.
-ACL_WRITE_DATA Write permission, or permission to create files.
-ACL_ADD_FILE Same as ACL_READ_DATA.
-ACL_APPEND_DATA Permission to create directories. Unused for files.
-ACL_ADD_SUBDIRECTORY Same as ACL_APPEND_DATA.
-ACL_READ_NAMED_ATTRS Unused.
-ACL_WRITE_NAMED_ATTRS Unused.
-ACL_EXECUTE Execute permission.
-ACL_DELETE_CHILD Permission to delete files and subdirectories.
-ACL_READ_ATTRIBUTES Permission to read basic attributes.
-ACL_WRITE_ATTRIBUTES Permission to change basic attributes.
-ACL_DELETE Permission to delete the object this ACL is placed on.
-ACL_READ_ACL Permission to read ACL.
-ACL_WRITE_ACL Permission to change the ACL and file mode.
-ACL_SYNCHRONIZE Unused.
-.Ed
+.Bl -column -offset 3n "ACL_WRITE_NAMED_ATTRS"
+.It ACL_READ_DATA Read permission
+.It ACL_LIST_DIRECTORY Same as ACL_READ_DATA
+.It ACL_WRITE_DATA Write permission, or permission to create files
+.It ACL_ADD_FILE Same as ACL_READ_DATA
+.It ACL_APPEND_DATA Permission to create directories. Ignored for files
+.It ACL_ADD_SUBDIRECTORY Same as ACL_APPEND_DATA
+.It ACL_READ_NAMED_ATTRS Ignored
+.It ACL_WRITE_NAMED_ATTRS Ignored
+.It ACL_EXECUTE Execute permission
+.It ACL_DELETE_CHILD Permission to delete files and subdirectories
+.It ACL_READ_ATTRIBUTES Permission to read basic attributes
+.It ACL_WRITE_ATTRIBUTES Permission to change basic attributes
+.It ACL_DELETE Permission to delete the object this ACL is placed on
+.It ACL_READ_ACL Permission to read ACL
+.It ACL_WRITE_ACL Permission to change the ACL and file mode
+.It ACL_SYNCHRONIZE Ignored
+.El
.Pp
Calling
.Fn acl_add_perm
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get.3#3 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/acl_get.3,v 1.18 2004/07/02 23:52:11 ru Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/acl_get.3,v 1.19 2009/05/23 13:51:05 trasz Exp $
.\"
.Dd December 29, 2002
.Dt ACL_GET 3
@@ -96,11 +96,11 @@
.Va type
argument are:
.Pp
-.Bd -literal -offset indent -compact
-ACL_TYPE_ACCESS POSIX.1e access ACL
-ACL_TYPE_DEFAULT POSIX.1e default ACL
-ACL_TYPE_NFS4 NFS4 ACL
-.Ed
+.Bl -column -offset 3n "ACL_TYPE_DEFAULT"
+.It ACL_TYPE_ACCESS POSIX.1e access ACL
+.It ACL_TYPE_DEFAULT POSIX.1e default ACL
+.It ACL_TYPE_NFS4 NFS4 ACL
+.El
.Pp
The ACL returned will be branded accordingly.
.Sh IMPLEMENTATION NOTES
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set.3#3 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/acl_set.3,v 1.17 2004/07/02 23:52:11 ru Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/acl_set.3,v 1.18 2009/05/23 13:51:05 trasz Exp $
.\"
.Dd December 29, 2002
.Dt ACL_SET 3
@@ -80,11 +80,11 @@
.Va type
argument are:
.Pp
-.Bd -literal -offset indent -compact
-ACL_TYPE_ACCESS POSIX.1e access ACL
-ACL_TYPE_DEFAULT POSIX.1e default ACL
-ACL_TYPE_NFS4 NFS4 ACL
-.Ed
+.Bl -column -offset 3n "ACL_TYPE_DEFAULT"
+.It ACL_TYPE_ACCESS POSIX.1e access ACL
+.It ACL_TYPE_DEFAULT POSIX.1e default ACL
+.It ACL_TYPE_NFS4 NFS4 ACL
+.El
.Pp
Trying to set ACL_TYPE_NFS4 with
.Va acl
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_tag_type.3#4 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/acl_set_tag_type.3,v 1.8 2008/11/04 00:20:43 imp Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/acl_set_tag_type.3,v 1.9 2009/05/23 13:51:05 trasz Exp $
.\"
.Dd March 10, 2001
.Dt ACL_SET_TAG_TYPE 3
@@ -49,16 +49,16 @@
.Pp
Valid values are:
.Pp
-.Bd -literal -offset indent -compact
-ACL_USER_OBJ Permissions apply to file owner.
-ACL_USER Permissions apply to user specified by qualifier.
-ACL_GROUP_OBJ Permissions apply to file owning group.
-ACL_GROUP Permissions apply to group specified by qualifier.
-ACL_MASK Permissions specify mask.
-ACL_OTHER Permissions apply to "other".
-ACL_OTHER_OBJ Same as ACL_OTHER
-ACL_EVERYONE Permissions apply to "everyone@".
-.Ed
+.Bl -column -offset 3n "ACL_OTHER_OBJ"
+.It ACL_USER_OBJ Permissions apply to file owner
+.It ACL_USER Permissions apply to additional user specified by qualifier
+.It ACL_GROUP_OBJ Permissions apply to file group
+.It ACL_GROUP Permissions apply to additional group specified by qualifier
+.It ACL_MASK Permissions specify mask
+.It ACL_OTHER Permissions apply to "other"
+.It ACL_OTHER_OBJ Same as ACL_OTHER
+.It ACL_EVERYONE Permissions apply to "everyone@"
+.El
.Pp
Calling
.Fn acl_set_tag_type
==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/boot/zfs/zfssubr.c#4 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cddl/boot/zfs/zfssubr.c,v 1.3 2009/05/16 10:48:20 dfr Exp $");
+__FBSDID("$FreeBSD: src/sys/cddl/boot/zfs/zfssubr.c,v 1.5 2009/05/23 16:01:58 des Exp $");
static uint64_t zfs_crc64_table[256];
==== //depot/projects/soc2008/trasz_nfs4acl/sys/opencrypto/cryptodev.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.39 2008/10/23 20:26:15 des Exp $");
+__FBSDID("$FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.40 2009/05/23 13:23:46 raj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -409,8 +409,10 @@
cse->uio.uio_rw = UIO_WRITE;
cse->uio.uio_td = td;
cse->uio.uio_iov[0].iov_len = cop->len;
- if (cse->thash)
+ if (cse->thash) {
cse->uio.uio_iov[0].iov_len += cse->thash->hashsize;
+ cse->uio.uio_resid += cse->thash->hashsize;
+ }
cse->uio.uio_iov[0].iov_base = malloc(cse->uio.uio_iov[0].iov_len,
M_XDATA, M_WAITOK);
More information about the p4-projects
mailing list