Deleted Added
full compact
zfs_main.c (259850) zfs_main.c (260156)
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 7 unchanged lines hidden (view full) ---

16 * fields enclosed by brackets "[]" replaced with your own identifying
17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 *
19 * CDDL HEADER END
20 */
21
22/*
23 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 7 unchanged lines hidden (view full) ---

16 * fields enclosed by brackets "[]" replaced with your own identifying
17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 *
19 * CDDL HEADER END
20 */
21
22/*
23 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
24 * Copyright (c) 2012 by Delphix. All rights reserved.
24 * Copyright (c) 2013 by Delphix. All rights reserved.
25 * Copyright 2012 Milan Jurik. All rights reserved.
26 * Copyright (c) 2012, Joyent, Inc. All rights reserved.
27 * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
28 * All rights reserved.
29 * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
30 * Copyright (c) 2013 Steven Hartland. All rights reserved.
31 * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
32 */

--- 2119 unchanged lines hidden (view full) ---

2152
2153static int us_type_bits[] = {
2154 USTYPE_PSX_GRP,
2155 USTYPE_PSX_USR,
2156 USTYPE_SMB_GRP,
2157 USTYPE_SMB_USR,
2158 USTYPE_ALL
2159};
25 * Copyright 2012 Milan Jurik. All rights reserved.
26 * Copyright (c) 2012, Joyent, Inc. All rights reserved.
27 * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
28 * All rights reserved.
29 * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
30 * Copyright (c) 2013 Steven Hartland. All rights reserved.
31 * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
32 */

--- 2119 unchanged lines hidden (view full) ---

2152
2153static int us_type_bits[] = {
2154 USTYPE_PSX_GRP,
2155 USTYPE_PSX_USR,
2156 USTYPE_SMB_GRP,
2157 USTYPE_SMB_USR,
2158 USTYPE_ALL
2159};
2160static char *us_type_names[] = { "posixgroup", "posxiuser", "smbgroup",
2160static char *us_type_names[] = { "posixgroup", "posixuser", "smbgroup",
2161 "smbuser", "all" };
2162
2163typedef struct us_node {
2164 nvlist_t *usn_nvl;
2165 uu_avl_node_t usn_avlnode;
2166 uu_list_node_t usn_listnode;
2167} us_node_t;
2168

--- 4610 unchanged lines hidden ---
2161 "smbuser", "all" };
2162
2163typedef struct us_node {
2164 nvlist_t *usn_nvl;
2165 uu_avl_node_t usn_avlnode;
2166 uu_list_node_t usn_listnode;
2167} us_node_t;
2168

--- 4610 unchanged lines hidden ---