From 2a235a434573f6659d6ebfc10ef33136384caad1 Mon Sep 17 00:00:00 2001 From: "Joshua M. Clulow" Date: Tue, 22 May 2018 16:28:15 +0000 Subject: backout 9421: causes TRITON-372 backout 9422: causes TRITON-372 Reviewed by: Dan McDonald Approved by: Dan McDonald --- usr/src/lib/libzfs/common/libzfs_diff.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'usr/src/lib/libzfs/common/libzfs_diff.c') diff --git a/usr/src/lib/libzfs/common/libzfs_diff.c b/usr/src/lib/libzfs/common/libzfs_diff.c index b47b669e80..d6cf32714d 100644 --- a/usr/src/lib/libzfs/common/libzfs_diff.c +++ b/usr/src/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, 2017 by Delphix. All rights reserved. + * Copyright (c) 2015 by Delphix. All rights reserved. * Copyright 2016 Joyent, Inc. * Copyright 2016 Igor Kozhukhov */ @@ -103,10 +103,7 @@ get_stats_for_obj(differ_info_t *di, const char *dsname, uint64_t obj, return (0); } - if (di->zerr == ESTALE) { - (void) snprintf(pn, maxlen, "(on_delete_queue)"); - return (0); - } else if (di->zerr == EPERM) { + if (di->zerr == EPERM) { (void) snprintf(di->errbuf, sizeof (di->errbuf), dgettext(TEXT_DOMAIN, "The sys_config privilege or diff delegated permission " -- cgit v1.2.3