Re: CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs

[Alan Barrett]

On Mon, 15 Oct 2012, Taylor R Campbell wrote:

@@ -796,7 +794,11 @@ 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
                }

I'd suggest using ifdef ENOTEMPTY instead of ifdef __NetBSD__ here.

(And the log message did not mention this change.)

--apb (Alan Barrett)