| libzfs_changelist.c (225828) | libzfs_changelist.c (226676) |
|---|---|
| 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 --- 108 unchanged lines hidden (view full) --- 117 continue; 118 119 if (!ZFS_IS_VOLUME(cn->cn_handle)) { 120 /* 121 * Do the property specific processing. 122 */ 123 switch (clp->cl_prop) { 124 case ZFS_PROP_MOUNTPOINT: | 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 --- 108 unchanged lines hidden (view full) --- 117 continue; 118 119 if (!ZFS_IS_VOLUME(cn->cn_handle)) { 120 /* 121 * Do the property specific processing. 122 */ 123 switch (clp->cl_prop) { 124 case ZFS_PROP_MOUNTPOINT: |
| 125 if (clp->cl_waslegacy && 126 (clp->cl_gflags & CL_GATHER_KEEP_LEGACY)) { 127 break; 128 } |
|
| 125 if (zfs_unmount(cn->cn_handle, NULL, 126 clp->cl_mflags) != 0) { 127 ret = -1; 128 cn->cn_needpost = B_FALSE; 129 } 130 break; 131 case ZFS_PROP_SHARESMB: 132 (void) zfs_unshare_smb(cn->cn_handle, NULL); --- 560 unchanged lines hidden --- | 129 if (zfs_unmount(cn->cn_handle, NULL, 130 clp->cl_mflags) != 0) { 131 ret = -1; 132 cn->cn_needpost = B_FALSE; 133 } 134 break; 135 case ZFS_PROP_SHARESMB: 136 (void) zfs_unshare_smb(cn->cn_handle, NULL); --- 560 unchanged lines hidden --- |