| zfs_iter.c (256281) | zfs_iter.c (263405) |
|---|---|
| 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 --- 4 unchanged lines hidden (view full) --- 13 * When distributing Covered Code, include this CDDL HEADER in each 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE. 15 * If applicable, add the following below this CDDL HEADER, with the 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 */ | 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 --- 4 unchanged lines hidden (view full) --- 13 * When distributing Covered Code, include this CDDL HEADER in each 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE. 15 * If applicable, add the following below this CDDL HEADER, with the 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 |
|
| 21/* 22 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. 23 * Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>. 24 * All rights reserved. | 22/* 23 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. 24 * Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>. 25 * All rights reserved. |
| 26 * Copyright 2013 Nexenta Systems, Inc. All rights reserved. |
|
| 25 */ 26 27#include <libintl.h> 28#include <libuutil.h> 29#include <stddef.h> 30#include <stdio.h> 31#include <stdlib.h> 32#include <strings.h> --- 71 unchanged lines hidden (view full) --- 104 &idx) == NULL) { 105 if (cb->cb_proplist) { 106 if ((*cb->cb_proplist) && 107 !(*cb->cb_proplist)->pl_all) 108 zfs_prune_proplist(zhp, 109 cb->cb_props_table); 110 111 if (zfs_expand_proplist(zhp, cb->cb_proplist, | 27 */ 28 29#include <libintl.h> 30#include <libuutil.h> 31#include <stddef.h> 32#include <stdio.h> 33#include <stdlib.h> 34#include <strings.h> --- 71 unchanged lines hidden (view full) --- 106 &idx) == NULL) { 107 if (cb->cb_proplist) { 108 if ((*cb->cb_proplist) && 109 !(*cb->cb_proplist)->pl_all) 110 zfs_prune_proplist(zhp, 111 cb->cb_props_table); 112 113 if (zfs_expand_proplist(zhp, cb->cb_proplist, |
| 112 (cb->cb_flags & ZFS_ITER_RECVD_PROPS)) | 114 (cb->cb_flags & ZFS_ITER_RECVD_PROPS), 115 (cb->cb_flags & ZFS_ITER_LITERAL_PROPS)) |
| 113 != 0) { 114 free(node); 115 return (-1); 116 } 117 } 118 uu_avl_insert(cb->cb_avl, node, idx); 119 dontclose = 1; 120 } else { --- 370 unchanged lines hidden --- | 116 != 0) { 117 free(node); 118 return (-1); 119 } 120 } 121 uu_avl_insert(cb->cb_avl, node, idx); 122 dontclose = 1; 123 } else { --- 370 unchanged lines hidden --- |