aboutsummaryrefslogtreecommitdiffstats
path: root/uts/common/fs/zfs/dmu_object.c
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2013-03-12 21:46:29 +0000
committerMartin Matuska <mm@FreeBSD.org>2013-03-12 21:46:29 +0000
commit4b9d8e5ee83b6fc14ca052bcb58e39c3c48ef680 (patch)
tree35b60accfad32d6dc768933ec327a2392d3fee74 /uts/common/fs/zfs/dmu_object.c
parentaaca951437a6b36e4475ecf818fdc557bceffd45 (diff)
downloadsrc-4b9d8e5ee83b6fc14ca052bcb58e39c3c48ef680.tar.gz
src-4b9d8e5ee83b6fc14ca052bcb58e39c3c48ef680.zip
Update vendor/illumos/dist and vendor-sys/illumos/dist
to illumos-gate 13980:d7059eb1884c Illumos ZFS issues: 3598 want to dtrace when errors are generated in zfs
Notes
Notes: svn path=/vendor-sys/illumos/dist/; revision=248217
Diffstat (limited to 'uts/common/fs/zfs/dmu_object.c')
-rw-r--r--uts/common/fs/zfs/dmu_object.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/uts/common/fs/zfs/dmu_object.c b/uts/common/fs/zfs/dmu_object.c
index 8dff46048902..11561f27ca64 100644
--- a/uts/common/fs/zfs/dmu_object.c
+++ b/uts/common/fs/zfs/dmu_object.c
@@ -20,6 +20,7 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
*/
#include <sys/dmu.h>
@@ -90,7 +91,7 @@ dmu_object_claim(objset_t *os, uint64_t object, dmu_object_type_t ot,
int err;
if (object == DMU_META_DNODE_OBJECT && !dmu_tx_private_ok(tx))
- return (EBADF);
+ return (SET_ERROR(EBADF));
err = dnode_hold_impl(os, object, DNODE_MUST_BE_FREE, FTAG, &dn);
if (err)
@@ -112,7 +113,7 @@ dmu_object_reclaim(objset_t *os, uint64_t object, dmu_object_type_t ot,
int err;
if (object == DMU_META_DNODE_OBJECT)
- return (EBADF);
+ return (SET_ERROR(EBADF));
err = dnode_hold_impl(os, object, DNODE_MUST_BE_ALLOCATED,
FTAG, &dn);