[src/trunk]: src Tests claim rename(..., "x/.") yields EISDIR, so do that. F...

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

details:   https://anonhg.NetBSD.org/src/rev/bebef6f8a080
branches:  trunk
changeset: 337275:bebef6f8a080
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Apr 09 05:03:58 2015 +0000

description:
Tests claim rename(..., "x/.") yields EISDIR, so do that.  Fixes zfs.

diffstat:

 sys/kern/vfs_syscalls.c |  6 +++---
 tests/fs/vfs/t_vnops.c  |  4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r 37f701f548d3 -r bebef6f8a080 sys/kern/vfs_syscalls.c
--- a/sys/kern/vfs_syscalls.c   Thu Apr 09 05:02:28 2015 +0000
+++ b/sys/kern/vfs_syscalls.c   Thu Apr 09 05:03:58 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_syscalls.c,v 1.493 2015/02/15 10:48:21 martin Exp $        */
+/*     $NetBSD: vfs_syscalls.c,v 1.494 2015/04/09 05:03:58 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.493 2015/02/15 10:48:21 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.494 2015/04/09 05:03:58 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_fileassoc.h"
@@ -4286,7 +4286,7 @@
            ((tnd.ni_cnd.cn_namelen == 2) &&
                (tnd.ni_cnd.cn_nameptr[0] == '.') &&
                (tnd.ni_cnd.cn_nameptr[1] == '.'))) {
-               error = EINVAL; /* XXX EISDIR?  */
+               error = EISDIR;
                goto abort1;
        }
 
diff -r 37f701f548d3 -r bebef6f8a080 tests/fs/vfs/t_vnops.c
--- a/tests/fs/vfs/t_vnops.c    Thu Apr 09 05:02:28 2015 +0000
+++ b/tests/fs/vfs/t_vnops.c    Thu Apr 09 05:03:58 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_vnops.c,v 1.46 2015/04/09 05:02:28 riastradh Exp $   */
+/*     $NetBSD: t_vnops.c,v 1.47 2015/04/09 05:03:58 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -274,8 +274,6 @@
        md(pb1, mp, "dir3/.");
        if (rump_sys_rename(pb1, pb3) != -1 || errno != EINVAL)
                atf_tc_fail_errno("rename 2");
-       if (FSTYPE_ZFS(tc))
-               atf_tc_expect_fail("PR kern/47656: Test known to be broken");
        if (rump_sys_rename(pb3, pb1) != -1 || errno != EISDIR)
                atf_tc_fail_errno("rename 3");