aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2018-07-31 21:31:24 +0000
committerAlexander Motin <mav@FreeBSD.org>2018-07-31 21:31:24 +0000
commitb3e8109985ed2075436bd692462b01df393da4cf (patch)
tree4fab31c99844b8974c10bb5f27307487ec160b2a /lib
parent2dcf06914ee36c295a4792b55680bb5290935f2a (diff)
downloadsrc-b3e8109985ed2075436bd692462b01df393da4cf.tar.gz
src-b3e8109985ed2075436bd692462b01df393da4cf.zip
9421 zdb should detect and print out the number of "leaked" objects
9422 zfs diff and zdb should explicitly mark objects that are on the deleted queue illumos/illumos-gate@20b5dafb425396adaebd0267d29e1026fc4dc413 Reviewed by: Matt Ahrens <matt@delphix.com> Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com> Approved by: Matt Ahrens <mahrens@delphix.com> Author: Paul Dagnelie <pcd@delphix.com>
Notes
Notes: svn path=/vendor-sys/illumos/dist/; revision=337014
Diffstat (limited to 'lib')
-rw-r--r--lib/libzfs/common/libzfs_diff.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/libzfs/common/libzfs_diff.c b/lib/libzfs/common/libzfs_diff.c
index d6cf32714d1f..b47b669e80cd 100644
--- a/lib/libzfs/common/libzfs_diff.c
+++ b/lib/libzfs/common/libzfs_diff.c
@@ -22,7 +22,7 @@
/*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2015 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2015 by Delphix. All rights reserved.
+ * Copyright (c) 2015, 2017 by Delphix. All rights reserved.
* Copyright 2016 Joyent, Inc.
* Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>
*/
@@ -103,7 +103,10 @@ get_stats_for_obj(differ_info_t *di, const char *dsname, uint64_t obj,
return (0);
}
- if (di->zerr == EPERM) {
+ if (di->zerr == ESTALE) {
+ (void) snprintf(pn, maxlen, "(on_delete_queue)");
+ return (0);
+ } else if (di->zerr == EPERM) {
(void) snprintf(di->errbuf, sizeof (di->errbuf),
dgettext(TEXT_DOMAIN,
"The sys_config privilege or diff delegated permission "