summaryrefslogtreecommitdiffstats
path: root/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2013-06-25 22:14:32 +0000
committerdelphij <delphij@FreeBSD.org>2013-06-25 22:14:32 +0000
commit4dfc3c75a2687795bcf32661c8434cf7628e82a2 (patch)
tree4b1454baea37713509a3ede6d1c64c528e9a810f /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
parent524046622706f82ee0244247e5a37dc1c966856f (diff)
downloadFreeBSD-src-4dfc3c75a2687795bcf32661c8434cf7628e82a2.zip
FreeBSD-src-4dfc3c75a2687795bcf32661c8434cf7628e82a2.tar.gz
MFV r252215:
Restore a previous behavior before r251646, where when destructing ZFS snapshot, the ioctl would return ENOENT when it hit any of them in the errlist (the new behavior was only return ENOENT when all returns error). Illumos ZFS issues: 3829 fix for 3740 changed behavior of zfs destroy/hold/release ioctl MFC after: 1 week
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
index b6fa417..a948e10 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
@@ -126,10 +126,6 @@ dsl_dataset_user_hold_check(void *arg, dmu_tx_t *tx)
}
}
- /* Return ENOENT if no holds would be created. */
- if (nvlist_empty(dduha->dduha_chkholds))
- return (SET_ERROR(ENOENT));
-
return (0);
}
@@ -468,10 +464,6 @@ dsl_dataset_user_release_check(void *arg, dmu_tx_t *tx)
}
}
- /* Return ENOENT if none of the holds existed. */
- if (nvlist_empty(ddura->ddura_chkholds))
- return (SET_ERROR(ENOENT));
-
return (0);
}
OpenPOWER on IntegriCloud