diff options
| author | Joshua M. Clulow <jmc@joyent.com> | 2018-05-22 16:28:15 +0000 |
|---|---|---|
| committer | Joshua M. Clulow <jmc@joyent.com> | 2018-05-23 19:55:08 +0000 |
| commit | 2a235a434573f6659d6ebfc10ef33136384caad1 (patch) | |
| tree | 516707888917b18955351b06fcdd686419eb8751 /usr/src/lib/libzfs/common/libzfs_diff.c | |
| parent | b64971bdda5ebae57056a4d21f436426ccab8f25 (diff) | |
| download | illumos-joyent-release-20180524.tar.gz | |
backout 9421: causes TRITON-372release-20180524
backout 9422: causes TRITON-372
Reviewed by: Dan McDonald <danmcd@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_diff.c')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_diff.c | 7 |
1 files changed, 2 insertions, 5 deletions
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 <ikozhukhov@gmail.com> */ @@ -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 " |