[src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs Back out accident...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9d2db4112a10
branches:  trunk
changeset: 782150:9d2db4112a10
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Oct 18 14:29:44 2012 +0000

description:
Back out accidental commit of errno kludge for rmdir(".") &c.

Solaris returns EEXIST, whereas we want to return ENOTEMPTY (POSIX
allows both), but this got included in an unrelated commit and should
be separated into a common commit for other related error code fixes.

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_dir.c |  4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diffs (15 lines):

diff -r 52e9ba28ba97 -r 9d2db4112a10 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_dir.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_dir.c      Thu Oct 18 14:22:57 2012 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_dir.c      Thu Oct 18 14:29:44 2012 +0000
@@ -801,11 +801,7 @@
                if (zp_is_dir && !zfs_dirempty(zp)) {   /* dir not empty */
                        mutex_exit(&zp->z_lock);
                        vn_vfsunlock(vp);
-#ifdef __NetBSD__              /* XXX Make our dumb tests happier...  */
-                       return (ENOTEMPTY);
-#else
                        return (EEXIST);
-#endif
                }
                if (zp->z_phys->zp_links <= zp_is_dir) {
                        zfs_panic_recover("zfs: link count on vnode %p is %u, "