Module Name: src
Committed By: riastradh
Date: Thu Apr 9 05:32:53 UTC 2015
Modified Files:
src/external/cddl/osnet/sys/sys: vnode.h
src/tests/fs/vfs: t_vnops.c
Log Message:
Fix vattr_init_mask: mode is mode_t, not u_short.
Fixes fs/vfs/t_vnops:zfs_attrs test.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/cddl/osnet/sys/sys/vnode.h
cvs rdiff -u -r1.47 -r1.48 src/tests/fs/vfs/t_vnops.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/sys/sys/vnode.h
diff -u src/external/cddl/osnet/sys/sys/vnode.h:1.12 src/external/cddl/osnet/sys/sys/vnode.h:1.13
--- src/external/cddl/osnet/sys/sys/vnode.h:1.12 Tue Oct 29 09:53:51 2013
+++ src/external/cddl/osnet/sys/sys/vnode.h Thu Apr 9 05:32:53 2015
@@ -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 @@ vattr_init_mask(vattr_t *vap)
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;
}
Index: src/tests/fs/vfs/t_vnops.c
diff -u src/tests/fs/vfs/t_vnops.c:1.47 src/tests/fs/vfs/t_vnops.c:1.48
--- src/tests/fs/vfs/t_vnops.c:1.47 Thu Apr 9 05:03:58 2015
+++ src/tests/fs/vfs/t_vnops.c Thu Apr 9 05:32:53 2015
@@ -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 @@ attrs(const atf_tc_t *tc, const char *mp
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);
