[src/trunk]: src Fix vattr_init_mask: mode is mode_t, not u_short.

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

details:   https://anonhg.NetBSD.org/src/rev/742ba60ba71c
branches:  trunk
changeset: 807419:742ba60ba71c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Apr 09 05:32:53 2015 +0000

description:
Fix vattr_init_mask: mode is mode_t, not u_short.

Fixes fs/vfs/t_vnops:zfs_attrs test.

diffstat:

 external/cddl/osnet/sys/sys/vnode.h |  4 ++--
 tests/fs/vfs/t_vnops.c              |  4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 018b2dd815a3 -r 742ba60ba71c external/cddl/osnet/sys/sys/vnode.h
--- a/external/cddl/osnet/sys/sys/vnode.h       Thu Apr 09 05:08:15 2015 +0000
+++ b/external/cddl/osnet/sys/sys/vnode.h       Thu Apr 09 05:32:53 2015 +0000
@@ -1,5 +1,5 @@
 
-/*     $NetBSD: vnode.h,v 1.12 2013/10/29 09:53:51 hannken Exp $       */
+/*     $NetBSD: vnode.h,v 1.13 2015/04/09 05:32:53 riastradh Exp $     */
 
 /*
  * CDDL HEADER START
@@ -521,7 +521,7 @@
                vap->va_mask |= AT_ATIME;
        if (vap->va_mtime.tv_sec != VNOVAL)
                vap->va_mask |= AT_MTIME;
-       if (vap->va_mode != (u_short)VNOVAL)
+       if (vap->va_mode != (mode_t)VNOVAL)
                vap->va_mask |= AT_MODE;
 }
 
diff -r 018b2dd815a3 -r 742ba60ba71c tests/fs/vfs/t_vnops.c
--- a/tests/fs/vfs/t_vnops.c    Thu Apr 09 05:08:15 2015 +0000
+++ b/tests/fs/vfs/t_vnops.c    Thu Apr 09 05:32:53 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_vnops.c,v 1.47 2015/04/09 05:03:58 riastradh Exp $   */
+/*     $NetBSD: t_vnops.c,v 1.48 2015/04/09 05:32:53 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -641,8 +641,6 @@
 
        RL(rump_sys_stat(TESTFILE, &sb2));
 #define CHECK(a) ATF_REQUIRE_EQ(sb.a, sb2.a)
-       if (FSTYPE_ZFS(tc))
-               atf_tc_expect_fail("PR kern/47656: Test known to be broken");
        if (!(FSTYPE_MSDOS(tc) || FSTYPE_SYSVBFS(tc))) {
                CHECK(st_uid);
                CHECK(st_gid);