| zfs_ioctl.c (241394) | zfs_ioctl.c (242862) |
|---|---|
| 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 --- 3231 unchanged lines hidden (view full) --- 3240 */ 3241 if (strncmp(zc->zc_name, name, len) != 0 || 3242 (name[len] != '@' && name[len] != '/')) { 3243 nvlist_free(nvl); 3244 return (EINVAL); 3245 } 3246 3247 (void) zfs_unmount_snap(name, NULL); | 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 --- 3231 unchanged lines hidden (view full) --- 3240 */ 3241 if (strncmp(zc->zc_name, name, len) != 0 || 3242 (name[len] != '@' && name[len] != '/')) { 3243 nvlist_free(nvl); 3244 return (EINVAL); 3245 } 3246 3247 (void) zfs_unmount_snap(name, NULL); |
| 3248 (void) zvol_remove_minor(name); |
|
| 3248 } 3249 3250 err = dmu_snapshots_destroy_nvl(nvl, zc->zc_defer_destroy, 3251 zc->zc_name); 3252 nvlist_free(nvl); 3253 return (err); 3254} 3255 --- 2279 unchanged lines hidden --- | 3249 } 3250 3251 err = dmu_snapshots_destroy_nvl(nvl, zc->zc_defer_destroy, 3252 zc->zc_name); 3253 nvlist_free(nvl); 3254 return (err); 3255} 3256 --- 2279 unchanged lines hidden --- |