| libzfs_dataset.c (205198) | libzfs_dataset.c (206199) |
|---|---|
| 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 --- 4274 unchanged lines hidden (view full) --- 4283 zhp->zfs_props_table = props; 4284 4285 curr = nvlist_next_nvpair(zhp->zfs_props, NULL); 4286 4287 while (curr) { 4288 zfs_prop_t zfs_prop = zfs_name_to_prop(nvpair_name(curr)); 4289 nvpair_t *next = nvlist_next_nvpair(zhp->zfs_props, curr); 4290 | 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 --- 4274 unchanged lines hidden (view full) --- 4283 zhp->zfs_props_table = props; 4284 4285 curr = nvlist_next_nvpair(zhp->zfs_props, NULL); 4286 4287 while (curr) { 4288 zfs_prop_t zfs_prop = zfs_name_to_prop(nvpair_name(curr)); 4289 nvpair_t *next = nvlist_next_nvpair(zhp->zfs_props, curr); 4290 |
| 4291 if (props[zfs_prop] == B_FALSE) | 4291 /* 4292 * We leave user:props in the nvlist, so there will be 4293 * some ZPROP_INVAL. To be extra safe, don't prune 4294 * those. 4295 */ 4296 if (zfs_prop != ZPROP_INVAL && props[zfs_prop] == B_FALSE) |
| 4292 (void) nvlist_remove(zhp->zfs_props, 4293 nvpair_name(curr), nvpair_type(curr)); 4294 curr = next; 4295 } 4296} 4297 4298/* 4299 * Attach/detach the given filesystem to/from the given jail. --- 39 unchanged lines hidden --- | 4297 (void) nvlist_remove(zhp->zfs_props, 4298 nvpair_name(curr), nvpair_type(curr)); 4299 curr = next; 4300 } 4301} 4302 4303/* 4304 * Attach/detach the given filesystem to/from the given jail. --- 39 unchanged lines hidden --- |