Module Name: src
Committed By: riastradh
Date: Thu Oct 18 14:29:44 UTC 2012
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_dir.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_dir.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_dir.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_dir.c:1.8 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_dir.c:1.9
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_dir.c:1.8 Mon Oct 15 23:51:11 2012
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_dir.c Thu Oct 18 14:29:44 2012
@@ -801,11 +801,7 @@ zfs_link_destroy(zfs_dirlock_t *dl, znod
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, "
