Skip to content

Commit 84dc8fb

Browse files
committed
Misc iSCSI fixes/cleanups/attempts to get 'zfs rename' to work.
!! Doesn't - a 'zfs rename' works, but most often than not, the rename !! IOCTL hangs. Not every time and not always on the first dataset being !! renamed... Seems a little to random to me.
1 parent 8520d4c commit 84dc8fb

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

lib/libzfs/libzfs_changelist.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,9 @@ changelist_postfix(prop_changelist_t *clp)
252252

253253
mounted = zfs_is_mounted(cn->cn_handle, NULL);
254254

255-
if (!mounted && (cn->cn_mounted ||
256-
((sharenfs || sharesmb || shareiscsi ||
257-
clp->cl_waslegacy) && (zfs_prop_get_int(cn->cn_handle,
255+
if (!mounted && !needs_key && (cn->cn_mounted ||
256+
((sharenfs || sharesmb || clp->cl_waslegacy) &&
257+
(zfs_prop_get_int(cn->cn_handle,
258258
ZFS_PROP_CANMOUNT) == ZFS_CANMOUNT_ON)))) {
259259
if (zfs_mount(cn->cn_handle, NULL, 0) != 0)
260260
errors++;
@@ -568,7 +568,7 @@ changelist_gather(zfs_handle_t *zhp, zfs_prop_t prop, int gather_flags,
568568
*/
569569
if (prop == ZFS_PROP_NAME || prop == ZFS_PROP_ZONED ||
570570
prop == ZFS_PROP_MOUNTPOINT || prop == ZFS_PROP_SHARENFS ||
571-
prop == ZFS_PROP_SHARESMB || prop == ZFS_PROP_SHAREISCSI) {
571+
prop == ZFS_PROP_SHARESMB) {
572572

573573
if (zfs_prop_get(zhp, ZFS_PROP_MOUNTPOINT,
574574
property, sizeof (property),
@@ -637,7 +637,7 @@ changelist_gather(zfs_handle_t *zhp, zfs_prop_t prop, int gather_flags,
637637
return (clp);
638638

639639
/*
640-
* If watching SHARENFS, SHARESMB then
640+
* If watching SHARENFS or SHARESMB then
641641
* also watch its companion property.
642642
*/
643643
/* TODO: add SHAREISCSI ? */

0 commit comments

Comments
 (0)