CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src Committed By: skrll Date: Sun Jul 25 06:07:42 UTC 2021 Modified Files: src/external/cddl/osnet/sys/kern: opensolaris.c Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/kern/opensolaris.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/kern/opensolaris.c diff -u src/external/cddl/osnet/sys/kern/opensolaris.c:1.2 src/external/cddl/osnet/sys/kern/opensolaris.c:1.3 --- src/external/cddl/osnet/sys/kern/opensolaris.c:1.2 Mon May 28 21:05:09 2018 +++ src/external/cddl/osnet/sys/kern/opensolaris.c Sun Jul 25 06:07:42 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: opensolaris.c,v 1.2 2018/05/28 21:05:09 chs Exp $ */ +/* $NetBSD: opensolaris.c,v 1.3 2021/07/25 06:07:42 skrll Exp $ */ /*- * Copyright 2007 John Birrell * @@ -28,11 +28,12 @@ */ #include +#include #include + #include #include #include -#include #include #include #include
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: kardel
Date: Sun Jul 18 07:22:22 UTC 2021
Modified Files:
src/external/cddl/osnet/sys/sys: vnode.h
Log Message:
PR kern/56316: vn_open doesn't follow symlinks
remove setting of O_NOFOLLOW. restores ZFS being able
to open devices via symlinks again.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/cddl/osnet/sys/sys/vnode.h
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.19 src/external/cddl/osnet/sys/sys/vnode.h:1.20
--- src/external/cddl/osnet/sys/sys/vnode.h:1.19 Tue Jun 29 22:40:53 2021
+++ src/external/cddl/osnet/sys/sys/vnode.h Sun Jul 18 07:22:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode.h,v 1.19 2021/06/29 22:40:53 dholland Exp $ */
+/* $NetBSD: vnode.h,v 1.20 2021/07/18 07:22:22 kardel Exp $ */
/*
* CDDL HEADER START
@@ -246,8 +246,6 @@ zfs_vn_open(const char *pnamep, enum uio
ASSERT(crwhy == CRCREAT);
ASSERT(umask == 0);
- filemode |= O_NOFOLLOW;
-
pb = pathbuf_create(pnamep);
error = vn_open(NULL, pb, 0, filemode, createmode, vpp, NULL, NULL);
if (error == 0) {
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Thu Apr 15 07:00:50 UTC 2021 Modified Files: src/external/cddl/osnet/sys/sys: opentypes.h Log Message: avoid second typedef for boolean_t in kernel code originally defined in To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/sys/sys/opentypes.h 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/opentypes.h diff -u src/external/cddl/osnet/sys/sys/opentypes.h:1.5 src/external/cddl/osnet/sys/sys/opentypes.h:1.6 --- src/external/cddl/osnet/sys/sys/opentypes.h:1.5 Wed Dec 4 22:21:42 2019 +++ src/external/cddl/osnet/sys/sys/opentypes.h Thu Apr 15 03:00:50 2021 @@ -36,7 +36,9 @@ typedef id_t ctid_t; #define B_FALSE 0 #define B_TRUE 1 +#ifndef _KERNEL typedef int boolean_t; +#endif #ifndef __defined_hr_t #define __defined_hr_t
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Thu Apr 15 06:59:57 UTC 2021 Modified Files: src/external/cddl/osnet/sys/sys: vnode.h Log Message: remove extra typedef for vnode_t done in To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/external/cddl/osnet/sys/sys/vnode.h 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.17 src/external/cddl/osnet/sys/sys/vnode.h:1.18 --- src/external/cddl/osnet/sys/sys/vnode.h:1.17 Tue May 26 04:39:27 2020 +++ src/external/cddl/osnet/sys/sys/vnode.h Thu Apr 15 02:59:57 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vnode.h,v 1.17 2020/05/26 08:39:27 hannken Exp $ */ +/* $NetBSD: vnode.h,v 1.18 2021/04/15 06:59:57 christos Exp $ */ /* * CDDL HEADER START @@ -99,10 +99,7 @@ #ifdef _KERNEL -struct vnode; struct vattr; - -typedef struct vnode vnode_t; typedef struct vattr vattr_t; typedef enum vtype vtype_t;
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: simonb Date: Mon Mar 29 01:43:18 UTC 2021 Modified Files: src/external/cddl/osnet/sys/sys: mutex_impl.h Log Message: Don't define mtx_owner here. mtx_owner is always available, and not all architecutres use the same structure for a kernel mutex. OK thorpej@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/sys/mutex_impl.h 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/mutex_impl.h diff -u src/external/cddl/osnet/sys/sys/mutex_impl.h:1.1 src/external/cddl/osnet/sys/sys/mutex_impl.h:1.2 --- src/external/cddl/osnet/sys/sys/mutex_impl.h:1.1 Sun Feb 21 01:46:36 2010 +++ src/external/cddl/osnet/sys/sys/mutex_impl.h Mon Mar 29 01:43:18 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mutex_impl.h,v 1.1 2010/02/21 01:46:36 darran Exp $ */ +/* $NetBSD: mutex_impl.h,v 1.2 2021/03/29 01:43:18 simonb Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -35,7 +35,6 @@ #define __MUTEX_PRIVATE #include -#define mtx_owner u.mtxa_owner #define MUTEX_THREAD ((uintptr_t)-16L) #define MUTEX_OWNER(mtx) \ ((mtx)->mtx_owner & MUTEX_THREAD)
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src
Committed By: chs
Date: Wed Nov 11 03:31:04 UTC 2020
Modified Files:
src/external/cddl/osnet/sys/kern: kmem.c
Log Message:
kmem_cache_create()'s "name" parameter can be on the stack,
so make a copy of it rather than keeping a pointer to it.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/kern/kmem.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/kern/kmem.c
diff -u src/external/cddl/osnet/sys/kern/kmem.c:1.2 src/external/cddl/osnet/sys/kern/kmem.c:1.3
--- src/external/cddl/osnet/sys/kern/kmem.c:1.2 Thu May 23 08:32:30 2019
+++ src/external/cddl/osnet/sys/kern/kmem.c Wed Nov 11 03:31:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kmem.c,v 1.2 2019/05/23 08:32:30 hannken Exp $ */
+/* $NetBSD: kmem.c,v 1.3 2020/11/11 03:31:04 chs Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -30,6 +30,7 @@
struct kmem_cache {
pool_cache_t km_pool;
+ char km_name[32];
void *km_private;
int (*km_constructor)(void *, void *, int);
void (*km_destructor)(void *, void *);
@@ -78,11 +79,12 @@ kmem_cache_create(char *name, size_t buf
KASSERT(vmp == NULL);
km = kmem_zalloc(sizeof(*km), KM_SLEEP);
+ strlcpy(km->km_name, name, sizeof(km->km_name));
km->km_private = private;
km->km_constructor = constructor;
km->km_destructor = destructor;
km->km_reclaim = reclaim;
- km->km_pool = pool_cache_init(bufsize, align, 0, 0, name, NULL,
+ km->km_pool = pool_cache_init(bufsize, align, 0, 0, km->km_name, NULL,
IPL_NONE, solaris_constructor, solaris_destructor, km);
if (km->km_pool == NULL) {
kmem_free(km, sizeof(*km));
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: hannken
Date: Mon Oct 12 08:21:21 UTC 2020
Modified Files:
src/external/cddl/osnet/sys/sys: cred.h
Log Message:
Stub groupmember() has to test both group list and current group id.
Fixes kern/55675: ZFS mounts do not work with setuid programs
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/cred.h
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/cred.h
diff -u src/external/cddl/osnet/sys/sys/cred.h:1.7 src/external/cddl/osnet/sys/sys/cred.h:1.8
--- src/external/cddl/osnet/sys/sys/cred.h:1.7 Wed Apr 29 05:54:37 2020
+++ src/external/cddl/osnet/sys/sys/cred.h Mon Oct 12 08:21:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cred.h,v 1.7 2020/04/29 05:54:37 riastradh Exp $ */
+/* $NetBSD: cred.h,v 1.8 2020/10/12 08:21:21 hannken Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -70,10 +70,12 @@ extern kauth_cred_t cred0;
static __inline int
groupmember(gid_t gid, cred_t *cr)
{
- int result;
+ int result, error;
- kauth_cred_ismember_gid(cr, gid, &result);
- return result;
+ error = kauth_cred_ismember_gid(cr, gid, &result);
+ if (error)
+ return 0;
+ return (kauth_cred_getegid(cr) == gid || result);
}
#endif /* _KERNEL */
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src
Committed By: hannken
Date: Fri Aug 28 16:13:48 UTC 2020
Modified Files:
src/external/cddl/osnet/sys/kern: policy.c
Log Message:
Glue operation secpolicy_fs_mount() passes wrong arguments to
operation kauth_authorize_system().
KAUTH_SYSTEM_MOUNT / KAUTH_REQ_SYSTEM_MOUNT_NEW wants the to be
covered vnode and the mount flags, not the mount structure.
Fix for PR kern/55602: zpool panic on mounting zfs filesystem
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/sys/kern/policy.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/kern/policy.c
diff -u src/external/cddl/osnet/sys/kern/policy.c:1.8 src/external/cddl/osnet/sys/kern/policy.c:1.9
--- src/external/cddl/osnet/sys/kern/policy.c:1.8 Sat May 16 18:31:46 2020
+++ src/external/cddl/osnet/sys/kern/policy.c Fri Aug 28 16:13:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: policy.c,v 1.8 2020/05/16 18:31:46 christos Exp $ */
+/* $NetBSD: policy.c,v 1.9 2020/08/28 16:13:48 hannken Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@ secpolicy_fs_mount(cred_t *cred, vnode_t
{
return kauth_authorize_system(cred, KAUTH_SYSTEM_MOUNT,
- KAUTH_REQ_SYSTEM_MOUNT_NEW, vfsp, NULL, NULL);
+ KAUTH_REQ_SYSTEM_MOUNT_NEW, mvp, KAUTH_ARG(vfsp->mnt_flag), NULL);
}
int
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src
Committed By: riastradh
Date: Tue Mar 3 06:44:38 UTC 2020
Modified Files:
src/external/cddl/osnet/sys/kern: printf.c
Log Message:
Use vpanic, not vprintf and then panic.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/kern/printf.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/kern/printf.c
diff -u src/external/cddl/osnet/sys/kern/printf.c:1.2 src/external/cddl/osnet/sys/kern/printf.c:1.3
--- src/external/cddl/osnet/sys/kern/printf.c:1.2 Mon May 28 21:05:09 2018
+++ src/external/cddl/osnet/sys/kern/printf.c Tue Mar 3 06:44:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: printf.c,v 1.2 2018/05/28 21:05:09 chs Exp $ */
+/* $NetBSD: printf.c,v 1.3 2020/03/03 06:44:38 riastradh Exp $ */
/*
* CDDL HEADER START
@@ -41,10 +41,8 @@ vcmn_err(int ce, const char *fmt, va_lis
char buf[256];
size_t len;
- if (ce == CE_PANIC) {
- vprintf(fmt, adx);
- panic("panic");
- }
+ if (ce == CE_PANIC)
+ vpanic(fmt, adx);
if ((uint_t)ce < CE_IGNORE) {
strcpy(buf, ce_prefix[ce]);
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src Committed By: pgoyette Date: Tue Dec 31 14:51:29 UTC 2019 Modified Files: src/external/cddl/osnet/sys/kern: misc.c Log Message: Another rename from uvm_free() --> uvm_availmem() To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/kern/misc.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/kern/misc.c diff -u src/external/cddl/osnet/sys/kern/misc.c:1.6 src/external/cddl/osnet/sys/kern/misc.c:1.7 --- src/external/cddl/osnet/sys/kern/misc.c:1.6 Sat Dec 21 13:00:20 2019 +++ src/external/cddl/osnet/sys/kern/misc.c Tue Dec 31 14:51:29 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: misc.c,v 1.6 2019/12/21 13:00:20 ad Exp $ */ +/* $NetBSD: misc.c,v 1.7 2019/12/31 14:51:29 pgoyette Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -130,7 +130,7 @@ kmem_reap(void) int bufcnt; struct pool *pp; - bufcnt = uvmexp.freetarg - uvm_free(); + bufcnt = uvmexp.freetarg - uvm_availmem(); if (bufcnt < 0) bufcnt = 0;
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: riastradh Date: Thu Dec 5 03:21:42 UTC 2019 Modified Files: src/external/cddl/osnet/sys/sys: opentypes.h Log Message: Avoid redefining uint_t &c. if compat_defs.h already defines them. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/opentypes.h 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/opentypes.h diff -u src/external/cddl/osnet/sys/sys/opentypes.h:1.4 src/external/cddl/osnet/sys/sys/opentypes.h:1.5 --- src/external/cddl/osnet/sys/sys/opentypes.h:1.4 Thu Sep 6 00:44:43 2018 +++ src/external/cddl/osnet/sys/sys/opentypes.h Thu Dec 5 03:21:42 2019 @@ -21,10 +21,12 @@ typedef struct timespec timestruc_t; #define __defined_ts_t typedef struct timespec timespec_t; #endif +#ifndef HAVE_NBTOOL_CONFIG_H typedef unsigned int uint_t; typedef unsigned char uchar_t; typedef unsigned short ushort_t; typedef unsigned long ulong_t; +#endif typedef off_t off64_t; typedef id_t taskid_t; typedef id_t projid_t;
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: christos
Date: Wed Feb 6 17:56:57 UTC 2019
Modified Files:
src/external/cddl/osnet/sys/sys: cred.h
Log Message:
use sizeof() properly (gcc-7)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/sys/sys/cred.h
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/cred.h
diff -u src/external/cddl/osnet/sys/sys/cred.h:1.5 src/external/cddl/osnet/sys/sys/cred.h:1.6
--- src/external/cddl/osnet/sys/sys/cred.h:1.5 Mon May 28 17:05:10 2018
+++ src/external/cddl/osnet/sys/sys/cred.h Wed Feb 6 12:56:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cred.h,v 1.5 2018/05/28 21:05:10 chs Exp $ */
+/* $NetBSD: cred.h,v 1.6 2019/02/06 17:56:57 christos Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -66,7 +66,7 @@ crgetgroups(cred_t *cr)
{
static gid_t gids[NGROUPS_MAX];
- memset(gids, 0, NGROUPS_MAX);
+ memset(gids, 0, sizeof(gids));
if (kauth_cred_getgroups(cr, gids, NGROUPS_MAX, UIO_SYSSPACE) != 0)
return NULL;
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: hannken Date: Sat Jan 12 10:44:36 UTC 2019 Modified Files: src/external/cddl/osnet/sys/sys: vnode.h Log Message: Allow zfs_vn_rdwr() with "rw == UIO_READ" too. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/external/cddl/osnet/sys/sys/vnode.h 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.14 src/external/cddl/osnet/sys/sys/vnode.h:1.15 --- src/external/cddl/osnet/sys/sys/vnode.h:1.14 Mon May 28 21:05:10 2018 +++ src/external/cddl/osnet/sys/sys/vnode.h Sat Jan 12 10:44:36 2019 @@ -1,5 +1,5 @@ -/* $NetBSD: vnode.h,v 1.14 2018/05/28 21:05:10 chs Exp $ */ +/* $NetBSD: vnode.h,v 1.15 2019/01/12 10:44:36 hannken Exp $ */ /* * CDDL HEADER START @@ -277,7 +277,7 @@ zfs_vn_rdwr(enum uio_rw rw, vnode_t *vp, int error; size_t resid; - ASSERT(rw == UIO_WRITE); + ASSERT(rw == UIO_READ || rw == UIO_WRITE); ASSERT(ioflag == 0); ASSERT(ulimit == RLIM64_INFINITY);
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src Committed By: hannken Date: Sat Jan 12 10:42:40 UTC 2019 Modified Files: src/external/cddl/osnet/sys/kern: taskq.c Log Message: Disable valid assertion "!(flags & TQ_NOQUEUE)" as "zfs send" triggers it. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/kern/taskq.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/kern/taskq.c diff -u src/external/cddl/osnet/sys/kern/taskq.c:1.7 src/external/cddl/osnet/sys/kern/taskq.c:1.8 --- src/external/cddl/osnet/sys/kern/taskq.c:1.7 Mon May 28 21:05:09 2018 +++ src/external/cddl/osnet/sys/kern/taskq.c Sat Jan 12 10:42:40 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: taskq.c,v 1.7 2018/05/28 21:05:09 chs Exp $ */ +/* $NetBSD: taskq.c,v 1.8 2019/01/12 10:42:40 hannken Exp $ */ /* * CDDL HEADER START @@ -1001,7 +1001,9 @@ taskq_dispatch(taskq_t *tq, task_func_t /* * TQ_NOQUEUE flag can't be used with non-dynamic task queues. */ +#ifdef notyet ASSERT(!(flags & TQ_NOQUEUE)); +#endif /* * Enqueue the task to the underlying queue. */
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src
Committed By: hannken
Date: Thu Dec 13 10:19:47 UTC 2018
Modified Files:
src/external/cddl/osnet/sys/kern: mod.c
Log Message:
Don't allow module to init before mp_online.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/kern/mod.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/kern/mod.c
diff -u src/external/cddl/osnet/sys/kern/mod.c:1.3 src/external/cddl/osnet/sys/kern/mod.c:1.4
--- src/external/cddl/osnet/sys/kern/mod.c:1.3 Mon May 28 21:05:09 2018
+++ src/external/cddl/osnet/sys/kern/mod.c Thu Dec 13 10:19:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mod.c,v 1.3 2018/05/28 21:05:09 chs Exp $ */
+/* $NetBSD: mod.c,v 1.4 2018/12/13 10:19:47 hannken Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mod.c,v 1.3 2018/05/28 21:05:09 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mod.c,v 1.4 2018/12/13 10:19:47 hannken Exp $");
#include
#include
@@ -49,6 +49,9 @@ solaris_modcmd(modcmd_t cmd, void *arg)
switch (cmd) {
case MODULE_CMD_INIT:
+ if (!mp_online)
+ return EAGAIN;
+
opensolaris_utsname_init();
callb_init(NULL);
taskq_init();
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: riastradh Date: Thu Nov 15 05:43:57 UTC 2018 Modified Files: src/external/cddl/osnet/sys/sys: zfs_context.h Log Message: Use callout_halt, not callout_stop, for FreeBSD callout_drain shim. Callers expect callout_drain will wait for it to complete if it has fired. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/external/cddl/osnet/sys/sys/zfs_context.h 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/zfs_context.h diff -u src/external/cddl/osnet/sys/sys/zfs_context.h:1.19 src/external/cddl/osnet/sys/sys/zfs_context.h:1.20 --- src/external/cddl/osnet/sys/sys/zfs_context.h:1.19 Mon May 28 21:05:10 2018 +++ src/external/cddl/osnet/sys/sys/zfs_context.h Thu Nov 15 05:43:57 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: zfs_context.h,v 1.19 2018/05/28 21:05:10 chs Exp $ */ +/* $NetBSD: zfs_context.h,v 1.20 2018/11/15 05:43:57 riastradh Exp $ */ /* * CDDL HEADER START @@ -789,7 +789,7 @@ void zfs_netbsd_setsize(vnode_t *, off_t #define getf fd_getfile #define releasef fd_putfile -#define callout_drain(x) callout_stop(x) +#define callout_drain(x) callout_halt(x, NULL) #endif /* _KERNEL */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: riastradh
Date: Thu Nov 15 04:55:26 UTC 2018
Modified Files:
src/external/cddl/osnet/sys/sys: proc.h
Log Message:
Omit unused definition with broken cpp conditional.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/sys/sys/proc.h
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/proc.h
diff -u src/external/cddl/osnet/sys/sys/proc.h:1.8 src/external/cddl/osnet/sys/sys/proc.h:1.9
--- src/external/cddl/osnet/sys/sys/proc.h:1.8 Sun Jun 3 05:55:08 2018
+++ src/external/cddl/osnet/sys/sys/proc.h Thu Nov 15 04:55:26 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.8 2018/06/03 05:55:08 chs Exp $ */
+/* $NetBSD: proc.h,v 1.9 2018/11/15 04:55:26 riastradh Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -86,12 +86,6 @@ typedef struct lwp _kthread;
typedef struct lwp kthread_t;
typedef struct lwp *kthread_id_t;
-#if (KSTACK_PAGES * PAGE_SIZE) < 16384
-#define ZFS_KSTACK_PAGES (16384 / PAGE_SIZE)
-#else
-#define ZFS_KSTACK_PAGES 0
-#endif
-
struct contract {
};
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: riastradh Date: Wed Nov 14 17:09:08 UTC 2018 Modified Files: src/external/cddl/osnet/sys/sys: isa_defs.h Log Message: Define _LP64 or _ILP32 for all architectures. Rather than write out a table for each architecture, rely on the C compiler to define _LP64 for 64-bit ones, on the assumption that anything not LP64 is ILP32, and on CTASSERTs to verify this assumption so that if it's wrong it'll fail safely with a noisy build failure. Gives zfs half a chance of building on, e.g., powerpc. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/sys/isa_defs.h 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/isa_defs.h diff -u src/external/cddl/osnet/sys/sys/isa_defs.h:1.2 src/external/cddl/osnet/sys/sys/isa_defs.h:1.3 --- src/external/cddl/osnet/sys/sys/isa_defs.h:1.2 Sat Feb 21 15:00:30 2015 +++ src/external/cddl/osnet/sys/sys/isa_defs.h Wed Nov 14 17:09:08 2018 @@ -1,12 +1,9 @@ -/* $NetBSD: isa_defs.h,v 1.2 2015/02/21 15:00:30 ozaki-r Exp $ */ +/* $NetBSD: isa_defs.h,v 1.3 2018/11/14 17:09:08 riastradh Exp $ */ /*- - * Copyright (c) 2009 The NetBSD Foundation, Inc. + * Copyright (c) 2018 The NetBSD Foundation, Inc. * All rights reserved. * - * This code is derived from software contributed to The NetBSD Foundation - * by Andrew Doran. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -29,23 +26,24 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#if defined(__i386__) -#if !defined(_ILP32) -#define _ILP32 -#endif - -#elif defined(__amd64__) -#if !defined(_LP64) -#define _LP64 -#endif +#ifndef _OSNET_SYS_ISA_DEFS_H_ +#define _OSNET_SYS_ISA_DEFS_H_ -#elif defined(__arm__) -#if !defined(_ILP32) -#define _ILP32 -#endif +#include +#ifdef _LP64 +__CTASSERT(sizeof(int) == 4); +__CTASSERT(sizeof(long) == 8); +__CTASSERT(sizeof(void *) == 8); #else -#error "architecture not supported" +/* + * For 64-bit architectures the compiler defines _LP64. All else in + * NetBSD is ILP32 for now. + */ +__CTASSERT(sizeof(int) == 4); +__CTASSERT(sizeof(long) == 4); +__CTASSERT(sizeof(void *) == 4); +#define _ILP32 1 #endif + +#endif /* _OSNET_SYS_ISA_DEFS_H_ */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Tue Oct 23 22:26:14 UTC 2018 Added Files: src/external/cddl/osnet/sys/sys: nvnamespace.h Log Message: Avoid conflicts with "our" (the FreeBSD) nvpair/nvlist implementation by prefixing all symbols with "opensolaris_". To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/sys/sys/nvnamespace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/cddl/osnet/sys/sys/nvnamespace.h diff -u /dev/null src/external/cddl/osnet/sys/sys/nvnamespace.h:1.1 --- /dev/null Tue Oct 23 18:26:14 2018 +++ src/external/cddl/osnet/sys/sys/nvnamespace.h Tue Oct 23 18:26:14 2018 @@ -0,0 +1,201 @@ +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Christos Zoulas. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef _OPENSOLARIS_SYS_NVNAMESPACE_H_ +#define _OPENSOLARIS_SYS_NVNAMESPACE_H_ + +#define fm_nvlist_create opensolaris_fm_nvlist_create +#define fm_nvlist_destroy opensolaris_fm_nvlist_destroy +#define fnvlist_add_boolean opensolaris_fnvlist_add_boolean +#define fnvlist_add_boolean_array opensolaris_fnvlist_add_boolean_array +#define fnvlist_add_boolean_value opensolaris_fnvlist_add_boolean_value +#define fnvlist_add_byte opensolaris_fnvlist_add_byte +#define fnvlist_add_byte_array opensolaris_fnvlist_add_byte_array +#define fnvlist_add_int16 opensolaris_fnvlist_add_int16 +#define fnvlist_add_int16_array opensolaris_fnvlist_add_int16_array +#define fnvlist_add_int32 opensolaris_fnvlist_add_int32 +#define fnvlist_add_int32_array opensolaris_fnvlist_add_int32_array +#define fnvlist_add_int64 opensolaris_fnvlist_add_int64 +#define fnvlist_add_int64_array opensolaris_fnvlist_add_int64_array +#define fnvlist_add_int8 opensolaris_fnvlist_add_int8 +#define fnvlist_add_int8_array opensolaris_fnvlist_add_int8_array +#define fnvlist_add_nvlist opensolaris_fnvlist_add_nvlist +#define fnvlist_add_nvlist_array opensolaris_fnvlist_add_nvlist_array +#define fnvlist_add_nvpair opensolaris_fnvlist_add_nvpair +#define fnvlist_add_string opensolaris_fnvlist_add_string +#define fnvlist_add_string_array opensolaris_fnvlist_add_string_array +#define fnvlist_add_uint16 opensolaris_fnvlist_add_uint16 +#define fnvlist_add_uint16_array opensolaris_fnvlist_add_uint16_array +#define fnvlist_add_uint32 opensolaris_fnvlist_add_uint32 +#define fnvlist_add_uint32_array opensolaris_fnvlist_add_uint32_array +#define fnvlist_add_uint64 opensolaris_fnvlist_add_uint64 +#define fnvlist_add_uint64_array opensolaris_fnvlist_add_uint64_array +#define fnvlist_add_uint8 opensolaris_fnvlist_add_uint8 +#define fnvlist_add_uint8_array opensolaris_fnvlist_add_uint8_array +#define fnvlist_alloc opensolaris_fnvlist_alloc +#define fnvlist_dup opensolaris_fnvlist_dup +#define fnvlist_free opensolaris_fnvlist_free +#define fnvlist_lookup_boolean opensolaris_fnvlist_lookup_boolean +#define fnvlist_lookup_boolean_value opensolaris_fnvlist_lookup_boolean_value +#define fnvlist_lookup_byte opensolaris_fnvlist_lookup_byte +#define fnvlist_lookup_int16 opensolaris_fnvlist_lookup_int16 +#define fnvlist_lookup_int32 opensolaris_fnvlist_lookup_int32 +#define fnvlist_lookup_int64 opensolaris_fnvlist_lookup_int64 +#define fnvlist_lookup_int8 opensolaris_fnvlist_lookup_int8 +#define fnvlist_lookup_nvlist opensolaris_fnvlist_lookup_nvlist +#define fnvlist_lookup_nvpair opensolaris_fnvlist_lookup_nvpair +#define fnvlist_lookup_string opensolaris_fnvlist_lookup_string +#define fnvlist_lookup_uint16 opensolaris_fnvlist_l
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Thu Sep 6 00:44:43 UTC 2018 Modified Files: src/external/cddl/osnet/sys/sys: opentypes.h Log Message: remove duplicate typedef (it is in sunddi.h) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/sys/opentypes.h 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/opentypes.h diff -u src/external/cddl/osnet/sys/sys/opentypes.h:1.3 src/external/cddl/osnet/sys/sys/opentypes.h:1.4 --- src/external/cddl/osnet/sys/sys/opentypes.h:1.3 Thu May 31 20:56:19 2018 +++ src/external/cddl/osnet/sys/sys/opentypes.h Wed Sep 5 20:44:43 2018 @@ -84,6 +84,5 @@ typedef int32_t time32_t; #define S_READ UIO_READ #define S_WRITE UIO_WRITE struct aio_req; -typedef void *dev_info_t; #endif /* _OPENSOLARIS_SYS_OPENTYPES_H_ */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Sun Jun 3 20:59:49 UTC 2018 Added Files: src/external/cddl/osnet/sys/sys: README Log Message: Add a blurb of a general approach how to maintain these files. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/sys/sys/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/cddl/osnet/sys/sys/README diff -u /dev/null src/external/cddl/osnet/sys/sys/README:1.1 --- /dev/null Sun Jun 3 16:59:49 2018 +++ src/external/cddl/osnet/sys/sys/README Sun Jun 3 16:59:49 2018 @@ -0,0 +1,41 @@ +# $NetBSD: README,v 1.1 2018/06/03 20:59:49 christos Exp $ + +General guidelines for system wrapper header maintainance. + +There are two kinds of system header files: +1. "infrastructure" headers that provide base definitions and + other stuff that other headers use (systm.h) +2. "feature" headers that provide a specific feature (proc.h). + +The solaris ones generally augment ours; the template should be: + +solaris/foo.h: + +#ifndef SOLARIS_SYS_FOO_H +#define SOLARIS_SYS_FOO_H + +/* + * This include should not be in #ifdef KERNEL. + * It is the job of the header itself to protect itself. + * Unless Solaris exposes this header in userland, where + * it is probably better to fix our header... + */ +#include_next + +/* More Solaris-specific definitions */ + +#endif /* SOLARIS_SYS_FOO_H */ + +Now there caaes where the solaris headers expose more stuff than ours, +so we need to include more of our system headers from theirs. When that +happens the rule should be that: + +Their infrastructure headers should not include our feature headers, +but can include our infrastructure headers, otherwise we end up with +circular dependencies. Violations to the rule should be kept to a minimum +and tested carefully. + +In the general case, if we want the augmented symbols we should include +the solaris ones first in the search path. + +
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Sun Jun 3 14:56:52 UTC 2018 Modified Files: src/external/cddl/osnet/sys/sys: mutex.h Log Message: The native mutex.h has a userland visible portion. make it so and fix the build. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/mutex.h 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/mutex.h diff -u src/external/cddl/osnet/sys/sys/mutex.h:1.4 src/external/cddl/osnet/sys/sys/mutex.h:1.5 --- src/external/cddl/osnet/sys/sys/mutex.h:1.4 Mon May 28 17:05:10 2018 +++ src/external/cddl/osnet/sys/sys/mutex.h Sun Jun 3 10:56:52 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: mutex.h,v 1.4 2018/05/28 21:05:10 chs Exp $ */ +/* $NetBSD: mutex.h,v 1.5 2018/06/03 14:56:52 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -32,10 +32,10 @@ #ifndef _OPENSOLARIS_SYS_MUTEX_H_ #define _OPENSOLARIS_SYS_MUTEX_H_ -#ifdef _KERNEL - #include_next +#ifdef _KERNEL + #define MUTEX_HELD(x) (mutex_owned(x)) #define MUTEX_NOT_HELD(x) (!mutex_owned(x) || panicstr != NULL) #define mutex_init(a, b, c, d) mutex_init(a, MUTEX_DEFAULT, IPL_NONE)
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: chs
Date: Sun Jun 3 05:55:08 UTC 2018
Modified Files:
src/external/cddl/osnet/sys/sys: proc.h sysmacros.h time.h types.h
Log Message:
tweak the osnet compat headers to allow building on MacOS and Linux hosts.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/proc.h
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/sys/sys/sysmacros.h
cvs rdiff -u -r1.11 -r1.12 src/external/cddl/osnet/sys/sys/time.h
cvs rdiff -u -r1.19 -r1.20 src/external/cddl/osnet/sys/sys/types.h
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/proc.h
diff -u src/external/cddl/osnet/sys/sys/proc.h:1.7 src/external/cddl/osnet/sys/sys/proc.h:1.8
--- src/external/cddl/osnet/sys/sys/proc.h:1.7 Sat Jun 2 18:46:34 2018
+++ src/external/cddl/osnet/sys/sys/proc.h Sun Jun 3 05:55:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.7 2018/06/02 18:46:34 christos Exp $ */
+/* $NetBSD: proc.h,v 1.8 2018/06/03 05:55:08 chs Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,9 @@
#define _OPENSOLARIS_SYS_PROC_H_
#include_next
+#ifdef __NetBSD__
#include
+#endif
#ifdef _KERNEL
Index: src/external/cddl/osnet/sys/sys/sysmacros.h
diff -u src/external/cddl/osnet/sys/sys/sysmacros.h:1.8 src/external/cddl/osnet/sys/sys/sysmacros.h:1.9
--- src/external/cddl/osnet/sys/sys/sysmacros.h:1.8 Mon May 28 21:05:10 2018
+++ src/external/cddl/osnet/sys/sys/sysmacros.h Sun Jun 3 05:55:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmacros.h,v 1.8 2018/05/28 21:05:10 chs Exp $ */
+/* $NetBSD: sysmacros.h,v 1.9 2018/06/03 05:55:08 chs Exp $ */
/*
* CDDL HEADER START
@@ -32,6 +32,16 @@
#ifndef _SYS_SYSMACROS_H
#define _SYS_SYSMACROS_H
+/*
+ * Linux includes from with
+ * __SYSMACROS_DEPRECATED_INCLUSION defined during the include,
+ * but some of the definitions here break in that context,
+ * so if that symbol is defined then only define the few macros
+ * that we need there.
+ */
+
+#ifndef __SYSMACROS_DEPRECATED_INCLUSION
+
#include
#include
@@ -52,6 +62,8 @@ extern "C" {
#define btodt(BB) ((BB) >> DEV_BSHIFT)
#define lbtod(BB) (((offset_t)(BB) + DEV_BSIZE - 1) >> DEV_BSHIFT)
+#endif /* __SYSMACROS_DEPRECATED_INCLUSION */
+
/* common macros */
#ifndef MIN
#define MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -66,6 +78,8 @@ extern "C" {
#define SIGNOF(a) ((a) < 0 ? -1 : (a) > 0)
#endif
+#ifndef __SYSMACROS_DEPRECATED_INCLUSION
+
#ifdef _KERNEL
/*
@@ -469,4 +483,6 @@ highbit64(uint64_t i)
}
#endif
+#endif /* __SYSMACROS_DEPRECATED_INCLUSION */
+
#endif /* _SYS_SYSMACROS_H */
Index: src/external/cddl/osnet/sys/sys/time.h
diff -u src/external/cddl/osnet/sys/sys/time.h:1.11 src/external/cddl/osnet/sys/sys/time.h:1.12
--- src/external/cddl/osnet/sys/sys/time.h:1.11 Sat Jun 2 18:46:34 2018
+++ src/external/cddl/osnet/sys/sys/time.h Sun Jun 3 05:55:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.11 2018/06/02 18:46:34 christos Exp $ */
+/* $NetBSD: time.h,v 1.12 2018/06/03 05:55:08 chs Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -92,8 +92,13 @@ ddi_get_lbolt64(void)
#else
+#ifdef __NetBSD__
int clock_gettime(clockid_t, struct timespec *)
__RENAME(__clock_gettime50);
+#endif
+#ifdef __linux__
+#include
+#endif
static __inline hrtime_t gethrtime(void) {
struct timespec ts;
Index: src/external/cddl/osnet/sys/sys/types.h
diff -u src/external/cddl/osnet/sys/sys/types.h:1.19 src/external/cddl/osnet/sys/sys/types.h:1.20
--- src/external/cddl/osnet/sys/sys/types.h:1.19 Fri Jun 1 00:56:19 2018
+++ src/external/cddl/osnet/sys/sys/types.h Sun Jun 3 05:55:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.19 2018/06/01 00:56:19 kre Exp $ */
+/* $NetBSD: types.h,v 1.20 2018/06/03 05:55:08 chs Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -65,11 +65,13 @@
*/
#define longlong_t __hide_longlong_t
#define u_longlong_t __hide_u_longlong_t
+
#ifndef _KERNEL
#include
#else
#include
#endif
+
#ifndef HAVE_NBTOOLS_CONFIG_H
#ifdef _NETBSD_SOURCE
#include_next
@@ -81,6 +83,7 @@
#undef _NETBSD_SOURCE
#endif
#endif
+
#undef longlong_t
#undef u_longlong_t
#ifndef __defined_ll_t
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: christos
Date: Sat Jun 2 18:46:34 UTC 2018
Modified Files:
src/external/cddl/osnet/sys/sys: proc.h systm.h time.h
Log Message:
- Remove more extraneous includes to avoid circular dependencies with the
real header files.
- Add to to avoid changing the source, but
it should really belong to the source.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/proc.h
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/sys/sys/systm.h
cvs rdiff -u -r1.10 -r1.11 src/external/cddl/osnet/sys/sys/time.h
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/proc.h
diff -u src/external/cddl/osnet/sys/sys/proc.h:1.6 src/external/cddl/osnet/sys/sys/proc.h:1.7
--- src/external/cddl/osnet/sys/sys/proc.h:1.6 Mon May 28 17:05:10 2018
+++ src/external/cddl/osnet/sys/sys/proc.h Sat Jun 2 14:46:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.6 2018/05/28 21:05:10 chs Exp $ */
+/* $NetBSD: proc.h,v 1.7 2018/06/02 18:46:34 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -60,7 +60,6 @@
#ifndef _OPENSOLARIS_SYS_PROC_H_
#define _OPENSOLARIS_SYS_PROC_H_
-#include
#include_next
#include
Index: src/external/cddl/osnet/sys/sys/systm.h
diff -u src/external/cddl/osnet/sys/sys/systm.h:1.5 src/external/cddl/osnet/sys/sys/systm.h:1.6
--- src/external/cddl/osnet/sys/sys/systm.h:1.5 Mon May 28 17:05:10 2018
+++ src/external/cddl/osnet/sys/sys/systm.h Sat Jun 2 14:46:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: systm.h,v 1.5 2018/05/28 21:05:10 chs Exp $ */
+/* $NetBSD: systm.h,v 1.6 2018/06/02 18:46:34 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -57,8 +57,6 @@
* $FreeBSD: head/sys/cddl/compat/opensolaris/sys/systm.h 296510 2016-03-08 17:27:13Z mav $
*/
-#include
-
#ifndef _OPENSOLARIS_SYS_SYSTM_H_
#define _OPENSOLARIS_SYS_SYSTM_H_
@@ -67,10 +65,9 @@
#include_next
#endif
-#include
-
#ifdef _KERNEL
#include
+#include
#define PAGESIZE PAGE_SIZE
#define PAGEOFFSET (PAGESIZE - 1)
Index: src/external/cddl/osnet/sys/sys/time.h
diff -u src/external/cddl/osnet/sys/sys/time.h:1.10 src/external/cddl/osnet/sys/sys/time.h:1.11
--- src/external/cddl/osnet/sys/sys/time.h:1.10 Thu May 31 20:56:19 2018
+++ src/external/cddl/osnet/sys/sys/time.h Sat Jun 2 14:46:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.10 2018/06/01 00:56:19 kre Exp $ */
+/* $NetBSD: time.h,v 1.11 2018/06/02 18:46:34 christos Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -62,7 +62,6 @@ typedef longlong_t hrtime_t;
#define NSEC_TO_TICK(nsec) ((nsec) / (NANOSEC / hz))
#ifdef _KERNEL
-#include
static __inline hrtime_t
gethrtime(void) {
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Sat Jun 2 15:47:22 UTC 2018 Modified Files: src/external/cddl/osnet/sys/sys: param.h Log Message: don't include To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/param.h 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/param.h diff -u src/external/cddl/osnet/sys/sys/param.h:1.4 src/external/cddl/osnet/sys/sys/param.h:1.5 --- src/external/cddl/osnet/sys/sys/param.h:1.4 Mon May 28 17:05:10 2018 +++ src/external/cddl/osnet/sys/sys/param.h Sat Jun 2 11:47:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.4 2018/05/28 21:05:10 chs Exp $ */ +/* $NetBSD: param.h,v 1.5 2018/06/02 15:47:22 christos Exp $ */ /* * Copyright (C) 2007 John Birrell @@ -29,8 +29,6 @@ * */ -#include - #ifndef _COMPAT_OPENSOLARIS_SYS_PARAM_H_ #define _COMPAT_OPENSOLARIS_SYS_PARAM_H_
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: kre Date: Fri Jun 1 00:56:19 UTC 2018 Modified Files: src/external/cddl/osnet/sys/sys: opentypes.h time.h types.h Log Message: Avoid duplicate typedefs so these headers can be used as part of tools build, when the base system compiler does not allow duplicate type definitions. Someone please fix this some better way than this! To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/sys/opentypes.h cvs rdiff -u -r1.9 -r1.10 src/external/cddl/osnet/sys/sys/time.h cvs rdiff -u -r1.18 -r1.19 src/external/cddl/osnet/sys/sys/types.h 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/opentypes.h diff -u src/external/cddl/osnet/sys/sys/opentypes.h:1.2 src/external/cddl/osnet/sys/sys/opentypes.h:1.3 --- src/external/cddl/osnet/sys/sys/opentypes.h:1.2 Mon May 28 21:05:10 2018 +++ src/external/cddl/osnet/sys/sys/opentypes.h Fri Jun 1 00:56:19 2018 @@ -5,8 +5,11 @@ #define FMNAMESZ 8 #if defined(__APPLE__) || defined(HAVE_NBTOOL_CONFIG_H) +#ifndef __defined_ll_t +#define __defined_ll_t typedef long long longlong_t; typedef unsigned long long u_longlong_t; +#endif typedef unsigned long vsize_t; #endif @@ -14,7 +17,10 @@ typedef unsigned int size32_t; typedef unsigned int caddr32_t; typedef struct timespec timestruc_t; +#ifndef __defined_ts_t +#define __defined_ts_t typedef struct timespec timespec_t; +#endif typedef unsigned int uint_t; typedef unsigned char uchar_t; typedef unsigned short ushort_t; @@ -30,7 +36,10 @@ typedef id_t ctid_t; #define B_TRUE 1 typedef int boolean_t; +#ifndef __defined_hr_t +#define __defined_hr_t typedef longlong_t hrtime_t; +#endif typedef int32_t t_scalar_t; typedef uint32_t t_uscalar_t; #if defined(_KERNEL) || defined(_KERNTYPES) @@ -61,7 +70,10 @@ typedef __caddr_t caddr_t; /* core addre typedef longlong_t offset_t; typedef u_longlong_t u_offset_t; typedef uint64_t upad64_t; +#ifndef __defined_ts_t +#define __defined_ts_t typedef struct timespec timespec_t; +#endif typedef int32_t daddr32_t; typedef int32_t time32_t; Index: src/external/cddl/osnet/sys/sys/time.h diff -u src/external/cddl/osnet/sys/sys/time.h:1.9 src/external/cddl/osnet/sys/sys/time.h:1.10 --- src/external/cddl/osnet/sys/sys/time.h:1.9 Mon May 28 21:05:10 2018 +++ src/external/cddl/osnet/sys/sys/time.h Fri Jun 1 00:56:19 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: time.h,v 1.9 2018/05/28 21:05:10 chs Exp $ */ +/* $NetBSD: time.h,v 1.10 2018/06/01 00:56:19 kre Exp $ */ /*- * Copyright (c) 2007 Pawel Jakub Dawidek @@ -45,7 +45,10 @@ #define NSEC2SEC(n) ((n) / (NANOSEC / SEC)) #define SEC2NSEC(m) ((hrtime_t)(m) * (NANOSEC / SEC)) +#ifndef __defined_hr_t +#define __defined_hr_t typedef longlong_t hrtime_t; +#endif #if defined(__i386__) || defined(__powerpc__) #define TIMESPEC_OVERFLOW(ts) \ Index: src/external/cddl/osnet/sys/sys/types.h diff -u src/external/cddl/osnet/sys/sys/types.h:1.18 src/external/cddl/osnet/sys/sys/types.h:1.19 --- src/external/cddl/osnet/sys/sys/types.h:1.18 Mon May 28 21:05:10 2018 +++ src/external/cddl/osnet/sys/sys/types.h Fri Jun 1 00:56:19 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.18 2018/05/28 21:05:10 chs Exp $ */ +/* $NetBSD: types.h,v 1.19 2018/06/01 00:56:19 kre Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -83,8 +83,11 @@ #endif #undef longlong_t #undef u_longlong_t +#ifndef __defined_ll_t +#define __defined_ll_t typedef long long longlong_t; typedef unsigned long long u_longlong_t; +#endif #ifndef _KERNEL #include
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Sun Jan 7 20:02:52 UTC 2018 Modified Files: src/external/cddl/osnet/sys/sys: time.h uio.h Log Message: add casts To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/time.h cvs rdiff -u -r1.9 -r1.10 src/external/cddl/osnet/sys/sys/uio.h 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/time.h diff -u src/external/cddl/osnet/sys/sys/time.h:1.7 src/external/cddl/osnet/sys/sys/time.h:1.8 --- src/external/cddl/osnet/sys/sys/time.h:1.7 Thu Apr 28 07:45:02 2016 +++ src/external/cddl/osnet/sys/sys/time.h Sun Jan 7 15:02:52 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: time.h,v 1.7 2016/04/28 11:45:02 christos Exp $ */ +/* $NetBSD: time.h,v 1.8 2018/01/07 20:02:52 christos Exp $ */ /*- * Copyright (c) 2007 Pawel Jakub Dawidek @@ -80,11 +80,12 @@ static __inline hrtime_t gethrtime(void) #ifdef CLOCK_REALTIME struct timespec ts; clock_gettime(CLOCK_REALTIME,&ts); - return (((u_int64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec); + return (hrtime_t)(((int64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec); #else struct timeval tv; gettimeofday(&tv, NULL); - return (((u_int64_t) tv.tv_sec) * MICROSEC + tv.tv_usec) * 1000; + return (hrtime_t) + int64_t) tv.tv_sec) * MICROSEC + tv.tv_usec) * 1000); #endif } Index: src/external/cddl/osnet/sys/sys/uio.h diff -u src/external/cddl/osnet/sys/sys/uio.h:1.9 src/external/cddl/osnet/sys/sys/uio.h:1.10 --- src/external/cddl/osnet/sys/sys/uio.h:1.9 Fri Sep 25 23:32:17 2015 +++ src/external/cddl/osnet/sys/sys/uio.h Sun Jan 7 15:02:52 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: uio.h,v 1.9 2015/09/26 03:32:17 christos Exp $ */ +/* $NetBSD: uio.h,v 1.10 2018/01/07 20:02:52 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -119,7 +119,7 @@ zfs_uiocopy(void *cp, size_t n, enum uio if ((err = uiomove(cp, n, &uio2)) != 0) return err; - *cbytes = uio->uio_resid - uio2.uio_resid; + *cbytes = (size_t)(uio->uio_resid - uio2.uio_resid); return (0); } @@ -139,9 +139,9 @@ zfs_uioskip(uio_t *uiop, size_t n) continue; } iovp->iov_base = (char *)iovp->iov_base + niovb; - uiop->uio_offset += niovb; + uiop->uio_offset += (off_t)niovb; iovp->iov_len -= niovb; - uiop->uio_resid -= niovb; + uiop->uio_resid -= (int)niovb; n -= niovb; }
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: kre Date: Sat Nov 18 18:52:59 UTC 2017 Modified Files: src/external/cddl/osnet/sys/sys: kmem.h Log Message: Let's define symbols before using them. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/sys/sys/kmem.h 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/kmem.h diff -u src/external/cddl/osnet/sys/sys/kmem.h:1.8 src/external/cddl/osnet/sys/sys/kmem.h:1.9 --- src/external/cddl/osnet/sys/sys/kmem.h:1.8 Sat Nov 18 13:51:56 2017 +++ src/external/cddl/osnet/sys/sys/kmem.h Sat Nov 18 18:52:59 2017 @@ -1,5 +1,5 @@ -/* $NetBSD: kmem.h,v 1.8 2017/11/18 13:51:56 christos Exp $ */ +/* $NetBSD: kmem.h,v 1.9 2017/11/18 18:52:59 kre Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -37,6 +37,9 @@ #include_next #include_next +#define KM_PUSHPAGE 0x00 /* XXXNETBSD */ +#define KMC_NODEBUG 0x00 + typedef void kmem_cache_t; u_long kmem_size(void); @@ -88,7 +91,4 @@ kmem_cache_alloc(kmem_cache_t *cache, in #define kmem_cache_free(cache, buf) pool_cache_put(cache, buf) #define kmem_cache_reap_now(cache) pool_cache_invalidate(cache) -#define KM_PUSHPAGE 0x00 /* XXXNETBSD */ -#define KMC_NODEBUG 0x00 - #endif /* _OPENSOLARIS_SYS_KMEM_H_ */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Sat Nov 18 13:51:56 UTC 2017 Modified Files: src/external/cddl/osnet/sys/sys: kmem.h Log Message: use symbolic constant for 0 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/kmem.h 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/kmem.h diff -u src/external/cddl/osnet/sys/sys/kmem.h:1.7 src/external/cddl/osnet/sys/sys/kmem.h:1.8 --- src/external/cddl/osnet/sys/sys/kmem.h:1.7 Fri Nov 17 13:18:01 2017 +++ src/external/cddl/osnet/sys/sys/kmem.h Sat Nov 18 08:51:56 2017 @@ -1,5 +1,5 @@ -/* $NetBSD: kmem.h,v 1.7 2017/11/17 18:18:01 christos Exp $ */ +/* $NetBSD: kmem.h,v 1.8 2017/11/18 13:51:56 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -79,7 +79,7 @@ kmem_cache_alloc(kmem_cache_t *cache, in * causes a deadlock we either need to provide an emergency * pool or handle the failure. */ - if (flags == 0) + if (flags == KM_PUSHPAGE) flags |= KM_SLEEP; return pool_cache_get(cache, flags); }
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: christos
Date: Fri Nov 17 18:18:01 UTC 2017
Modified Files:
src/external/cddl/osnet/sys/sys: kmem.h
Log Message:
our pool code needs either PR_SLEEP or PR_NOWAIT; arrange for that explaining
the current choice :-)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/kmem.h
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/kmem.h
diff -u src/external/cddl/osnet/sys/sys/kmem.h:1.6 src/external/cddl/osnet/sys/sys/kmem.h:1.7
--- src/external/cddl/osnet/sys/sys/kmem.h:1.6 Sat Feb 20 20:46:36 2010
+++ src/external/cddl/osnet/sys/sys/kmem.h Fri Nov 17 13:18:01 2017
@@ -1,5 +1,5 @@
-/* $NetBSD: kmem.h,v 1.6 2010/02/21 01:46:36 darran Exp $ */
+/* $NetBSD: kmem.h,v 1.7 2017/11/17 18:18:01 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@ u_long kmem_size(void);
u_long kmem_used(void);
void kmem_reap(void);
-void *calloc(size_t n, size_t s);
+void *calloc(size_t, size_t);
static inline kmem_cache_t *
kmem_cache_create(char *name, size_t bufsize, size_t align,
@@ -62,8 +62,29 @@ kmem_cache_create(char *name, size_t buf
return pc;
}
+static inline void *
+kmem_cache_alloc(kmem_cache_t *cache, int flags)
+{
+ /*
+ * This happens when we specify KM_PUSHPAGE by itself.
+ *
+ * According to kmem_cache_create(9) KM_PUSHPAGE can be used
+ * together with KM_SLEEP and in that case the code will not
+ * cause a deadlock. It does not say if KM_PUSHPAGE can be
+ * used with KM_NOSLEEP. In our case, we don't have a pool
+ * of emergency pages, so we prefer to KM_SLEEP instead of
+ * using KM_NOSLEEP and potentially returning NULL, under the
+ * assumption that the code wants to use the emergency pool
+ * because it does not want the allocation to fail. If that
+ * causes a deadlock we either need to provide an emergency
+ * pool or handle the failure.
+ */
+ if (flags == 0)
+ flags |= KM_SLEEP;
+ return pool_cache_get(cache, flags);
+}
+
#define kmem_cache_destroy(cache) pool_cache_destroy(cache)
-#define kmem_cache_alloc(cache, flags) pool_cache_get(cache, flags)
#define kmem_cache_free(cache, buf) pool_cache_put(cache, buf)
#define kmem_cache_reap_now(cache) pool_cache_invalidate(cache)
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src
Committed By: pgoyette
Date: Thu Jun 23 05:19:42 UTC 2016
Modified Files:
src/external/cddl/osnet/sys/kern: string.c
Log Message:
On NetBSD we already have strpbrk() in libkern, so we don't need to
provide another copy in the module. Removes another 'redefined symbol'
error when loading the module.
Related to PR kern/51265
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/kern/string.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/kern/string.c
diff -u src/external/cddl/osnet/sys/kern/string.c:1.2 src/external/cddl/osnet/sys/kern/string.c:1.3
--- src/external/cddl/osnet/sys/kern/string.c:1.2 Tue Dec 14 01:01:40 2010
+++ src/external/cddl/osnet/sys/kern/string.c Thu Jun 23 05:19:42 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: string.c,v 1.2 2010/12/14 01:01:40 haad Exp $ */
+/* $NetBSD: string.c,v 1.3 2016/06/23 05:19:42 pgoyette Exp $ */
/*
* CDDL HEADER START
@@ -33,6 +33,7 @@
#define IS_ALPHA(c) \
(((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z'))
+#ifndef __NetBSD__
char *
strpbrk(const char *s, const char *b)
{
@@ -47,6 +48,7 @@ strpbrk(const char *s, const char *b)
return (NULL);
}
+#endif
/*
* Convert a string into a valid C identifier by replacing invalid
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: christos
Date: Thu Apr 28 11:45:02 UTC 2016
Modified Files:
src/external/cddl/osnet/sys/sys: time.h
Log Message:
include stdio.h for NULL
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/time.h
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/time.h
diff -u src/external/cddl/osnet/sys/sys/time.h:1.6 src/external/cddl/osnet/sys/sys/time.h:1.7
--- src/external/cddl/osnet/sys/sys/time.h:1.6 Sun Dec 27 16:42:09 2015
+++ src/external/cddl/osnet/sys/sys/time.h Thu Apr 28 07:45:02 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.6 2015/12/27 21:42:09 christos Exp $ */
+/* $NetBSD: time.h,v 1.7 2016/04/28 11:45:02 christos Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -72,6 +72,8 @@ int clock_gettime(clockid_t, struct time
__RENAME(__clock_gettime50)
#endif
;
+#else
+#include /* For NULL */
#endif
static __inline hrtime_t gethrtime(void) {
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: christos
Date: Mon Feb 1 02:12:55 UTC 2016
Modified Files:
src/external/cddl/osnet/sys/sys: sysmacros.h types.h
Added Files:
src/external/cddl/osnet/sys/sys: opentypes.h
Log Message:
Split the opensolaris types into opentypes.h because linux includes
sysmacros.h from types.h and we can't interpose ourselves to define
the needed types otherwise.
Disable unused macros, get rid of __APPLE__
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/sys/sys/opentypes.h
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/sysmacros.h
cvs rdiff -u -r1.16 -r1.17 src/external/cddl/osnet/sys/sys/types.h
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/sysmacros.h
diff -u src/external/cddl/osnet/sys/sys/sysmacros.h:1.6 src/external/cddl/osnet/sys/sys/sysmacros.h:1.7
--- src/external/cddl/osnet/sys/sys/sysmacros.h:1.6 Sun Dec 27 16:40:21 2015
+++ src/external/cddl/osnet/sys/sys/sysmacros.h Sun Jan 31 21:12:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmacros.h,v 1.6 2015/12/27 21:40:21 christos Exp $ */
+/* $NetBSD: sysmacros.h,v 1.7 2016/02/01 02:12:55 christos Exp $ */
/*
* CDDL HEADER START
@@ -33,6 +33,7 @@
#define _SYS_SYSMACROS_H
#include
+#include
#ifdef __cplusplus
extern "C" {
@@ -348,7 +349,7 @@ extern unsigned char bcd_to_byte[256];
* because if a field crosses a byte boundary it's not likely to be meaningful
* without reassembly in its nonnative endianness.
*/
-#if !defined(__NetBSD__) && !defined(__APPLE__)
+#ifdef notdef
#if defined(_BIT_FIELDS_LTOH)
#define DECL_BITFIELD2(_a, _b)\
uint8_t _a, _b
Index: src/external/cddl/osnet/sys/sys/types.h
diff -u src/external/cddl/osnet/sys/sys/types.h:1.16 src/external/cddl/osnet/sys/sys/types.h:1.17
--- src/external/cddl/osnet/sys/sys/types.h:1.16 Sun Jan 31 01:15:39 2016
+++ src/external/cddl/osnet/sys/sys/types.h Sun Jan 31 21:12:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.16 2016/01/31 06:15:39 christos Exp $ */
+/* $NetBSD: types.h,v 1.17 2016/02/01 02:12:55 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -63,11 +63,12 @@
/*
* This is a bag of dirty hacks to keep things compiling.
*/
-#ifdef __APPLE__
+#ifndef _KERNEL
#include
#else
#include
#endif
+#ifndef HAVE_NBTOOLS_CONFIG_H
#ifdef _NETBSD_SOURCE
#include_next
#include_next
@@ -77,6 +78,7 @@
#include_next
#undef _NETBSD_SOURCE
#endif
+#endif
#ifndef _KERNEL
#include
@@ -84,76 +86,6 @@
#include
#endif
-#define MAXNAMELEN 256
-#define FMNAMESZ 8
-
-#ifdef __APPLE__
-typedef int64_t longlong_t;
-typedef uint64_t u_longlong_t;
-typedef unsigned long vsize_t;
-#endif
-
-typedef unsigned int size32_t;
-typedef unsigned int caddr32_t;
-
-typedef struct timespec timestruc_t;
-typedef u_int uint_t;
-typedef u_char uchar_t;
-typedef u_short ushort_t;
-typedef u_long ulong_t;
-typedef off_t off64_t;
-typedef id_t taskid_t;
-typedef id_t projid_t;
-typedef id_t poolid_t;
-typedef id_t zoneid_t;
-typedef id_t ctid_t;
-
-#define B_FALSE 0
-#define B_TRUE 1
-typedef int boolean_t;
-
-typedef longlong_t hrtime_t;
-typedef int32_t t_scalar_t;
-typedef uint32_t t_uscalar_t;
-#if defined(_KERNEL) || defined(_KERNTYPES)
-typedef vsize_t pgcnt_t;
-#endif
-typedef u_longlong_t len_t;
-typedef int major_t;
-typedef int minor_t;
-typedef int o_uid_t;
-typedef int o_gid_t;
-typedef struct kauth_cred cred_t;
-typedef uintptr_t pc_t;
-typedef struct vm_page page_t;
-typedef ushort_t o_mode_t; /* old file attribute type */
-typedef u_longlong_t diskaddr_t;
-typedef void *zone_t;
-typedef struct vfsops vfsops_t;
-
-#ifdef _KERNEL
-
-typedef short index_t;
-typedef off_t offset_t;
-typedef int64_t rlim64_t;
-typedef __caddr_t caddr_t; /* core address */
-
-#else
-
-typedef longlong_t offset_t;
-typedef u_longlong_t u_offset_t;
-typedef uint64_t upad64_t;
-typedef struct timespec timespec_t;
-typedef int32_t daddr32_t;
-typedef int32_t time32_t;
-
-#endif /* !_KERNEL */
-
-#define MAXOFFSET_T 0x7fffLL
-#define seg_rw uio_rw
-#define S_READ UIO_READ
-#define S_WRITE UIO_WRITE
-struct aio_req;
-typedef void *dev_info_t;
+#include
#endif /* !_OPENSOLARIS_SYS_TYPES_H_ */
Added files:
Index: src/external/cddl/osnet/sys/sys/opentypes.h
diff -u /dev/null src/external/cddl/osnet/sys/sys/opentypes.h:1.1
--- /dev/null Sun Jan 31 21:12:55 2016
+++ src/external/cddl/osnet/sys/sys/opentypes.h Sun Jan 31 21:12:55 2016
@@ -0,0 +1,76 @@
+#ifndef _OPENSOLARIS_SYS_OPENTYPES_H_
+#define _OPENSOLARIS_SYS_OPENTYPES_H_
+
+#define MAXNAMELEN 256
+#define FMNAMESZ 8
+
+#if defined(__APPLE__) || defined(HAVE_NBTOOL_CONFIG_H)
+typedef int64_t longlong_t;
+typedef uint64_t u_longlong_t;
+typedef unsigned long vsize_t;
+#endif
+
+typedef unsigned int size32_t;
+typedef unsigned int caddr32_t;
+
+typedef struct times
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Mon Feb 1 02:09:54 UTC 2016 Modified Files: src/external/cddl/osnet/sys/sys: errno.h Log Message: prevent re-defines To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/sys/errno.h 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/errno.h diff -u src/external/cddl/osnet/sys/sys/errno.h:1.1 src/external/cddl/osnet/sys/sys/errno.h:1.2 --- src/external/cddl/osnet/sys/sys/errno.h:1.1 Fri Aug 7 16:57:57 2009 +++ src/external/cddl/osnet/sys/sys/errno.h Sun Jan 31 21:09:54 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: errno.h,v 1.1 2009/08/07 20:57:57 haad Exp $ */ +/* $NetBSD: errno.h,v 1.2 2016/02/01 02:09:54 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -29,7 +29,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifndef EBADE #define EBADE ENOSR +#endif +#ifndef EBADR #define EBADR ENOSTR +#endif #include_next
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Sun Jan 31 06:15:39 UTC 2016 Modified Files: src/external/cddl/osnet/sys/sys: types.h Log Message: define it when we have vaddr_t exposed. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/cddl/osnet/sys/sys/types.h 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/types.h diff -u src/external/cddl/osnet/sys/sys/types.h:1.15 src/external/cddl/osnet/sys/sys/types.h:1.16 --- src/external/cddl/osnet/sys/sys/types.h:1.15 Sun Jan 31 00:31:28 2016 +++ src/external/cddl/osnet/sys/sys/types.h Sun Jan 31 01:15:39 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.15 2016/01/31 05:31:28 christos Exp $ */ +/* $NetBSD: types.h,v 1.16 2016/01/31 06:15:39 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -115,7 +115,7 @@ typedef int boolean_t; typedef longlong_t hrtime_t; typedef int32_t t_scalar_t; typedef uint32_t t_uscalar_t; -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_KERNTYPES) typedef vsize_t pgcnt_t; #endif typedef u_longlong_t len_t;
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Sun Jan 31 05:31:28 UTC 2016 Modified Files: src/external/cddl/osnet/sys/sys: types.h Log Message: we don't keed page count in userland. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/external/cddl/osnet/sys/sys/types.h 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/types.h diff -u src/external/cddl/osnet/sys/sys/types.h:1.14 src/external/cddl/osnet/sys/sys/types.h:1.15 --- src/external/cddl/osnet/sys/sys/types.h:1.14 Sun Jan 31 00:21:53 2016 +++ src/external/cddl/osnet/sys/sys/types.h Sun Jan 31 00:31:28 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.14 2016/01/31 05:21:53 christos Exp $ */ +/* $NetBSD: types.h,v 1.15 2016/01/31 05:31:28 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -115,7 +115,7 @@ typedef int boolean_t; typedef longlong_t hrtime_t; typedef int32_t t_scalar_t; typedef uint32_t t_uscalar_t; -#ifdef _KERNTYPES +#ifdef _KERNEL typedef vsize_t pgcnt_t; #endif typedef u_longlong_t len_t;
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Sun Jan 31 05:21:53 UTC 2016 Modified Files: src/external/cddl/osnet/sys/sys: types.h Log Message: only need pgcnt_t in kernel. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/cddl/osnet/sys/sys/types.h 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/types.h diff -u src/external/cddl/osnet/sys/sys/types.h:1.13 src/external/cddl/osnet/sys/sys/types.h:1.14 --- src/external/cddl/osnet/sys/sys/types.h:1.13 Thu Dec 12 13:20:49 2013 +++ src/external/cddl/osnet/sys/sys/types.h Sun Jan 31 00:21:53 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.13 2013/12/12 18:20:49 matt Exp $ */ +/* $NetBSD: types.h,v 1.14 2016/01/31 05:21:53 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -115,7 +115,9 @@ typedef int boolean_t; typedef longlong_t hrtime_t; typedef int32_t t_scalar_t; typedef uint32_t t_uscalar_t; +#ifdef _KERNTYPES typedef vsize_t pgcnt_t; +#endif typedef u_longlong_t len_t; typedef int major_t; typedef int minor_t;
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: christos
Date: Sun Dec 27 21:42:09 UTC 2015
Modified Files:
src/external/cddl/osnet/sys/sys: time.h
Log Message:
We don't need to declare clock_gettime if we don't have it and we don't need
to __RENAME if we are not NetBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/sys/sys/time.h
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/time.h
diff -u src/external/cddl/osnet/sys/sys/time.h:1.5 src/external/cddl/osnet/sys/sys/time.h:1.6
--- src/external/cddl/osnet/sys/sys/time.h:1.5 Mon Dec 21 08:28:39 2015
+++ src/external/cddl/osnet/sys/sys/time.h Sun Dec 27 16:42:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.5 2015/12/21 13:28:39 joerg Exp $ */
+/* $NetBSD: time.h,v 1.6 2015/12/27 21:42:09 christos Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -66,8 +66,13 @@ gethrtime(void) {
#else
+#ifdef CLOCK_REALTIME
int clock_gettime(clockid_t, struct timespec *)
-__RENAME(__clock_gettime50);
+#ifdef __RENAME
+__RENAME(__clock_gettime50)
+#endif
+;
+#endif
static __inline hrtime_t gethrtime(void) {
#ifdef CLOCK_REALTIME
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Sun Dec 27 21:40:21 UTC 2015 Modified Files: src/external/cddl/osnet/sys/sys: sysmacros.h Log Message: Override roundup. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/sys/sys/sysmacros.h 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/sysmacros.h diff -u src/external/cddl/osnet/sys/sys/sysmacros.h:1.5 src/external/cddl/osnet/sys/sys/sysmacros.h:1.6 --- src/external/cddl/osnet/sys/sys/sysmacros.h:1.5 Sat Feb 7 15:30:04 2015 +++ src/external/cddl/osnet/sys/sys/sysmacros.h Sun Dec 27 16:40:21 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sysmacros.h,v 1.5 2015/02/07 20:30:04 christos Exp $ */ +/* $NetBSD: sysmacros.h,v 1.6 2015/12/27 21:40:21 christos Exp $ */ /* * CDDL HEADER START @@ -230,6 +230,7 @@ extern unsigned char bcd_to_byte[256]; */ #undef howmany #define howmany(x, y) (((x)+((y)-1))/(y)) +#undef roundup #define roundup(x, y) x)+((y)-1))/(y))*(y)) #endif /* !__NetBSD__ */
CVS commit: src/external/cddl/osnet/sys
Module Name:src Committed By: christos Date: Sun Dec 27 21:39:34 UTC 2015 Modified Files: src/external/cddl/osnet/sys: assert.h Log Message: don't re-define __assert. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/assert.h 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/assert.h diff -u src/external/cddl/osnet/sys/assert.h:1.1 src/external/cddl/osnet/sys/assert.h:1.2 --- src/external/cddl/osnet/sys/assert.h:1.1 Fri Aug 7 16:57:57 2009 +++ src/external/cddl/osnet/sys/assert.h Sun Dec 27 16:39:34 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: assert.h,v 1.1 2009/08/07 20:57:57 haad Exp $ */ +/* $NetBSD: assert.h,v 1.2 2015/12/27 21:39:34 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -31,4 +31,6 @@ #include_next "assert.h" +#ifndef __assert #define __assert(a, b, c) __assert(a, c, b) +#endif
Re: CVS commit: src/external/cddl/osnet/sys/sys
Nice catch! Perhaps an entry in src/doc/HACKS would be appropriate? Thanks, Al On 21 December 2015 at 05:28, Joerg Sonnenberger wrote: > Module Name:src > Committed By: joerg > Date: Mon Dec 21 13:28:39 UTC 2015 > > Modified Files: > src/external/cddl/osnet/sys/sys: time.h > > Log Message: > Our time.h defines clock_gettime with assembler name after including > sys/time.h. The Solaris compat code in sys/time.h wants to use it in an > inline function, but misses a prototype (and the relabeling). As stopgap > for getting consistent defines of clock_gettime duplicate the prototype > here. > > > To generate a diff of this commit: > cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/time.h > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. >
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: joerg
Date: Mon Dec 21 13:28:39 UTC 2015
Modified Files:
src/external/cddl/osnet/sys/sys: time.h
Log Message:
Our time.h defines clock_gettime with assembler name after including
sys/time.h. The Solaris compat code in sys/time.h wants to use it in an
inline function, but misses a prototype (and the relabeling). As stopgap
for getting consistent defines of clock_gettime duplicate the prototype
here.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/time.h
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/time.h
diff -u src/external/cddl/osnet/sys/sys/time.h:1.4 src/external/cddl/osnet/sys/sys/time.h:1.5
--- src/external/cddl/osnet/sys/sys/time.h:1.4 Fri Mar 26 21:33:28 2010
+++ src/external/cddl/osnet/sys/sys/time.h Mon Dec 21 13:28:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.4 2010/03/26 21:33:28 christos Exp $ */
+/* $NetBSD: time.h,v 1.5 2015/12/21 13:28:39 joerg Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -66,6 +66,9 @@ gethrtime(void) {
#else
+int clock_gettime(clockid_t, struct timespec *)
+__RENAME(__clock_gettime50);
+
static __inline hrtime_t gethrtime(void) {
#ifdef CLOCK_REALTIME
struct timespec ts;
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Fri Oct 2 17:28:57 UTC 2015 Modified Files: src/external/cddl/osnet/sys/sys: sdt.h Log Message: put back the DTRACE macros To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/sdt.h 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/sdt.h diff -u src/external/cddl/osnet/sys/sys/sdt.h:1.6 src/external/cddl/osnet/sys/sys/sdt.h:1.7 --- src/external/cddl/osnet/sys/sys/sdt.h:1.6 Fri Oct 2 13:13:58 2015 +++ src/external/cddl/osnet/sys/sys/sdt.h Fri Oct 2 13:28:57 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sdt.h,v 1.6 2015/10/02 17:13:58 christos Exp $ */ +/* $NetBSD: sdt.h,v 1.7 2015/10/02 17:28:57 christos Exp $ */ /*- * Copyright (c) 2007 Pawel Jakub Dawidek @@ -33,5 +33,26 @@ #include_next #include + +#undef DTRACE_PROBE +#undef DTRACE_PROBE1 +#undef DTRACE_PROBE2 +#undef DTRACE_PROBE3 +#undef DTRACE_PROBE4 +#undef DTRACE_PROBE5 +#undef DTRACE_PROBE6 +#undef DTRACE_PROBE7 + +#define DTRACE_PROBE(name) +#define DTRACE_PROBE1(name, type1, arg1) +#define DTRACE_PROBE2(name, type1, arg1, type2, arg2) +#define DTRACE_PROBE3(name, type1, arg1, type2, arg2, type3, arg3) +#define DTRACE_PROBE4(name, type1, arg1, type2, arg2, type3, arg3, type4, arg4) +#define DTRACE_PROBE5(name, type1, arg1, type2, arg2, type3, arg3, \ + type4, arg4, type5, arg5) +#define DTRACE_PROBE6(name, type1, arg1, type2, arg2, type3, arg3, \ + type4, arg4, type5, arg5, type6, arg6) +#define DTRACE_PROBE7(name, type1, arg1, type2, arg2, type3, arg3, \ + type4, arg4, type5, arg5, type6, arg6, type7, arg7) #endif /* _OPENSOLARIS_SYS_SDT_H_ */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: christos
Date: Fri Oct 2 17:13:58 UTC 2015
Modified Files:
src/external/cddl/osnet/sys/sys: sdt.h
Log Message:
we don't need any of this now.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/sys/sys/sdt.h
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/sdt.h
diff -u src/external/cddl/osnet/sys/sys/sdt.h:1.5 src/external/cddl/osnet/sys/sys/sdt.h:1.6
--- src/external/cddl/osnet/sys/sys/sdt.h:1.5 Mon Mar 1 18:42:41 2010
+++ src/external/cddl/osnet/sys/sys/sdt.h Fri Oct 2 13:13:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdt.h,v 1.5 2010/03/01 23:42:41 darran Exp $ */
+/* $NetBSD: sdt.h,v 1.6 2015/10/02 17:13:58 christos Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -34,37 +34,4 @@
#include_next
#include
-#ifdef _KERNEL
-typedef struct {
-char name[SDT_MAX_NAME_SIZE];
-dtrace_provider_id_t id;
-dtrace_pattr_t attr;
-sdt_probe_t *probes[];
-} sdt_provider_t;
-
-int sdt_register(sdt_provider_t *);
-int sdt_unregister(sdt_provider_t *);
-#endif /* _KERNEL */
-
-#undef DTRACE_PROBE
-#undef DTRACE_PROBE1
-#undef DTRACE_PROBE2
-#undef DTRACE_PROBE3
-#undef DTRACE_PROBE4
-#undef DTRACE_PROBE5
-#undef DTRACE_PROBE6
-#undef DTRACE_PROBE7
-
-#define DTRACE_PROBE(name)
-#define DTRACE_PROBE1(name, type1, arg1)
-#define DTRACE_PROBE2(name, type1, arg1, type2, arg2)
-#define DTRACE_PROBE3(name, type1, arg1, type2, arg2, type3, arg3)
-#define DTRACE_PROBE4(name, type1, arg1, type2, arg2, type3, arg3, type4, arg4)
-#define DTRACE_PROBE5(name, type1, arg1, type2, arg2, type3, arg3, \
- type4, arg4, type5, arg5)
-#define DTRACE_PROBE6(name, type1, arg1, type2, arg2, type3, arg3, \
- type4, arg4, type5, arg5, type6, arg6)
-#define DTRACE_PROBE7(name, type1, arg1, type2, arg2, type3, arg3, \
- type4, arg4, type5, arg5, type6, arg6, type7, arg7)
-
#endif /* _OPENSOLARIS_SYS_SDT_H_ */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: christos
Date: Sat Sep 26 03:32:17 UTC 2015
Modified Files:
src/external/cddl/osnet/sys/sys: uio.h
Log Message:
avoid compiler warnings
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/sys/sys/uio.h
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/uio.h
diff -u src/external/cddl/osnet/sys/sys/uio.h:1.8 src/external/cddl/osnet/sys/sys/uio.h:1.9
--- src/external/cddl/osnet/sys/sys/uio.h:1.8 Tue Apr 21 09:15:28 2015
+++ src/external/cddl/osnet/sys/sys/uio.h Fri Sep 25 23:32:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uio.h,v 1.8 2015/04/21 13:15:28 riastradh Exp $ */
+/* $NetBSD: uio.h,v 1.9 2015/09/26 03:32:17 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -127,18 +127,18 @@ zfs_uiocopy(void *cp, size_t n, enum uio
static __inline void
zfs_uioskip(uio_t *uiop, size_t n)
{
- if (n > uiop->uio_resid)
+ if (n > (size_t)uiop->uio_resid)
return;
while (n != 0) {
- register iovec_t*iovp = uiop->uio_iov;
- register size_t niovb = MIN(iovp->iov_len, n);
+ iovec_t*iovp = uiop->uio_iov;
+ size_t niovb = MIN(iovp->iov_len, n);
if (niovb == 0) {
uiop->uio_iov++;
uiop->uio_iovcnt--;
continue;
}
- iovp->iov_base += niovb;
+ iovp->iov_base = (char *)iovp->iov_base + niovb;
uiop->uio_offset += niovb;
iovp->iov_len -= niovb;
uiop->uio_resid -= niovb;
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src Committed By: riz Date: Thu Sep 10 19:56:13 UTC 2015 Modified Files: src/external/cddl/osnet/sys/kern: ddi.c Log Message: include for curlwp. From ozaki-r. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/kern/ddi.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/kern/ddi.c diff -u src/external/cddl/osnet/sys/kern/ddi.c:1.4 src/external/cddl/osnet/sys/kern/ddi.c:1.5 --- src/external/cddl/osnet/sys/kern/ddi.c:1.4 Tue Dec 14 01:18:34 2010 +++ src/external/cddl/osnet/sys/kern/ddi.c Thu Sep 10 19:56:13 2015 @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: riastradh
Date: Tue Apr 21 13:15:28 UTC 2015
Modified Files:
src/external/cddl/osnet/sys/sys: uio.h
Log Message:
Remove bogus size_t->int casts in uiomove.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/uio.h
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/uio.h
diff -u src/external/cddl/osnet/sys/sys/uio.h:1.7 src/external/cddl/osnet/sys/sys/uio.h:1.8
--- src/external/cddl/osnet/sys/sys/uio.h:1.7 Sat Apr 11 01:49:00 2015
+++ src/external/cddl/osnet/sys/sys/uio.h Tue Apr 21 13:15:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uio.h,v 1.7 2015/04/11 01:49:00 riastradh Exp $ */
+/* $NetBSD: uio.h,v 1.8 2015/04/21 13:15:28 riastradh Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@ zfs_uiomove(void *cp, size_t n, enum uio
{
assert(uio->uio_rw == dir);
- return (uiomove(cp, (int)n, uio));
+ return (uiomove(cp, n, uio));
}
static __inline int
@@ -116,7 +116,7 @@ zfs_uiocopy(void *cp, size_t n, enum uio
memcpy(&uio2, uio, sizeof(*uio));
assert(uio->uio_rw == dir);
- if ((err = uiomove(cp, (int)n, &uio2)) != 0)
+ if ((err = uiomove(cp, n, &uio2)) != 0)
return err;
*cbytes = uio->uio_resid - uio2.uio_resid;
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src Committed By: riastradh Date: Sat Apr 11 16:32:07 UTC 2015 Modified Files: src/external/cddl/osnet/sys/kern: taskq.c Log Message: Fix ASSERT(x == y | z). Interpret nthreads as pct when requested. Reduces the number of threads created by zfs to a slightly less insane value. XXX This whole taskq business is questionable, and we really really should not have copies of external code outside dist/ and without vendor branches to record provenance and local changes. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/kern/taskq.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/kern/taskq.c diff -u src/external/cddl/osnet/sys/kern/taskq.c:1.4 src/external/cddl/osnet/sys/kern/taskq.c:1.5 --- src/external/cddl/osnet/sys/kern/taskq.c:1.4 Sat Apr 11 00:13:04 2015 +++ src/external/cddl/osnet/sys/kern/taskq.c Sat Apr 11 16:32:07 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: taskq.c,v 1.4 2015/04/11 00:13:04 riastradh Exp $ */ +/* $NetBSD: taskq.c,v 1.5 2015/04/11 16:32:07 riastradh Exp $ */ /* * CDDL HEADER START @@ -905,7 +905,8 @@ taskq_create_common(const char *name, in uint_t bsize; /* # of buckets - always power of 2 */ ASSERT(instance == 0); - ASSERT(flags == TASKQ_PREPOPULATE | TASKQ_NOINSTANCE); + ASSERT(!ISSET(flags, TASKQ_CPR_SAFE)); + ASSERT(!ISSET(flags, TASKQ_DYNAMIC)); /* * TASKQ_CPR_SAFE and TASKQ_DYNAMIC flags are mutually exclusive. @@ -919,7 +920,10 @@ taskq_create_common(const char *name, in ASSERT(bsize >= 1); bsize = MIN(bsize, taskq_maxbuckets); - tq->tq_maxsize = nthreads; + ASSERT(!(flags & TASKQ_DYNAMIC)); + if (flags & TASKQ_THREADS_CPU_PCT) + /* nthreads is % of CPUs we want to use. */ + nthreads = (ncpus*nthreads)/100; (void) strncpy(tq->tq_name, name, TASKQ_NAMELEN + 1); tq->tq_name[TASKQ_NAMELEN] = '\0';
CVS commit: src/external/cddl/osnet/sys/rpc
Module Name:src Committed By: riastradh Date: Sat Apr 11 03:22:36 UTC 2015 Removed Files: src/external/cddl/osnet/sys/rpc: xdr.h Log Message: Remove broken shim for xdr_control. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/external/cddl/osnet/sys/rpc/xdr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: riastradh
Date: Sat Apr 11 01:49:00 UTC 2015
Modified Files:
src/external/cddl/osnet/sys/sys: uio.h
Log Message:
Nuke UIO_XUIO so nothing accidentally misuses it.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/uio.h
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/uio.h
diff -u src/external/cddl/osnet/sys/sys/uio.h:1.6 src/external/cddl/osnet/sys/sys/uio.h:1.7
--- src/external/cddl/osnet/sys/sys/uio.h:1.6 Thu Mar 19 22:57:45 2015
+++ src/external/cddl/osnet/sys/sys/uio.h Sat Apr 11 01:49:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uio.h,v 1.6 2015/03/19 22:57:45 riastradh Exp $ */
+/* $NetBSD: uio.h,v 1.7 2015/04/11 01:49:00 riastradh Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -87,10 +87,6 @@ struct xuio {
void *xuio_priv;
};
-/* XXX HACK ? how xuio can be handled properly */
-#define uio_extflg uio_offset
-#define UIO_XUIO 0x0004 /* Structure is xuio_t */
-
#define XUIO_XUZC_PRIV(xuio) ((xuio)->xuio_priv)
#define XUIO_XUZC_RW(xuio) ((xuio)->xuio_rw)
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src Committed By: riastradh Date: Sat Apr 11 00:13:04 UTC 2015 Modified Files: src/external/cddl/osnet/sys/kern: taskq.c Log Message: Make taskq_dispatch fail for now with TQ_NOQUEUE; make caller retry. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/kern/taskq.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/kern/taskq.c diff -u src/external/cddl/osnet/sys/kern/taskq.c:1.3 src/external/cddl/osnet/sys/kern/taskq.c:1.4 --- src/external/cddl/osnet/sys/kern/taskq.c:1.3 Fri Jun 21 16:22:46 2013 +++ src/external/cddl/osnet/sys/kern/taskq.c Sat Apr 11 00:13:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: taskq.c,v 1.3 2013/06/21 16:22:46 christos Exp $ */ +/* $NetBSD: taskq.c,v 1.4 2015/04/11 00:13:04 riastradh Exp $ */ /* * CDDL HEADER START @@ -721,6 +721,14 @@ taskq_dispatch(taskq_t *tq, task_func_t /* * TQ_NOQUEUE flag can't be used with non-dynamic task queues. */ +#ifdef __NetBSD__ + /* + * Dynamic task queues didn't seem to get imported. Caller + * must be prepared to handle failure anyway, so just fail. + */ + if (flags & TQ_NOQUEUE) + return ((taskqid_t)NULL); +#endif ASSERT(! (flags & TQ_NOQUEUE)); /*
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: riastradh
Date: Thu Mar 19 22:57:45 UTC 2015
Modified Files:
src/external/cddl/osnet/sys/sys: uio.h
Log Message:
These are expressions, not statements. No semicolon.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/sys/sys/uio.h
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/uio.h
diff -u src/external/cddl/osnet/sys/sys/uio.h:1.5 src/external/cddl/osnet/sys/sys/uio.h:1.6
--- src/external/cddl/osnet/sys/sys/uio.h:1.5 Tue Dec 14 01:21:25 2010
+++ src/external/cddl/osnet/sys/sys/uio.h Thu Mar 19 22:57:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uio.h,v 1.5 2010/12/14 01:21:25 haad Exp $ */
+/* $NetBSD: uio.h,v 1.6 2015/03/19 22:57:45 riastradh Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -91,8 +91,8 @@ struct xuio {
#define uio_extflg uio_offset
#define UIO_XUIO 0x0004 /* Structure is xuio_t */
-#define XUIO_XUZC_PRIV(xuio) ((xuio)->xuio_priv);
-#define XUIO_XUZC_RW(xuio) ((xuio)->xuio_rw);
+#define XUIO_XUZC_PRIV(xuio) ((xuio)->xuio_priv)
+#define XUIO_XUZC_RW(xuio) ((xuio)->xuio_rw)
typedef struct uio uio_t;
typedef struct xuio xuio_t;
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: ozaki-r
Date: Tue Mar 4 09:24:42 UTC 2014
Modified Files:
src/external/cddl/osnet/sys/sys: mount.h
Log Message:
Get rid of unused variable definition za from mount.h
There is no user for it. Even worse, it breaks dtrace build for arm.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/mount.h
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/mount.h
diff -u src/external/cddl/osnet/sys/sys/mount.h:1.6 src/external/cddl/osnet/sys/sys/mount.h:1.7
--- src/external/cddl/osnet/sys/sys/mount.h:1.6 Sat Oct 20 22:11:38 2012
+++ src/external/cddl/osnet/sys/sys/mount.h Tue Mar 4 09:24:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mount.h,v 1.6 2012/10/20 22:11:38 riastradh Exp $ */
+/* $NetBSD: mount.h,v 1.7 2014/03/04 09:24:42 ozaki-r Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -52,7 +52,7 @@ struct zfs_args {
int datalen;
int optlen;
int flags;
-} za;
+};
typedef struct zfs_args zfs_args_t;
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: matt Date: Thu Dec 12 18:20:49 UTC 2013 Modified Files: src/external/cddl/osnet/sys/sys: types.h Log Message: Don't define ptrdiff_t since that's done in the NetBSD To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/cddl/osnet/sys/sys/types.h 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/types.h diff -u src/external/cddl/osnet/sys/sys/types.h:1.12 src/external/cddl/osnet/sys/sys/types.h:1.13 --- src/external/cddl/osnet/sys/sys/types.h:1.12 Sun Jul 17 20:54:33 2011 +++ src/external/cddl/osnet/sys/sys/types.h Thu Dec 12 18:20:49 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.12 2011/07/17 20:54:33 joerg Exp $ */ +/* $NetBSD: types.h,v 1.13 2013/12/12 18:20:49 matt Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -133,7 +133,6 @@ typedef struct vfsops vfsops_t; typedef short index_t; typedef off_t offset_t; -typedef long ptrdiff_t; /* pointer difference */ typedef int64_t rlim64_t; typedef __caddr_t caddr_t; /* core address */
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src
Committed By: christos
Date: Mon Nov 25 22:48:05 UTC 2013
Modified Files:
src/external/cddl/osnet/sys/kern: vfs.c
Log Message:
fix one more mountlist instant
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/kern/vfs.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/kern/vfs.c
diff -u src/external/cddl/osnet/sys/kern/vfs.c:1.4 src/external/cddl/osnet/sys/kern/vfs.c:1.5
--- src/external/cddl/osnet/sys/kern/vfs.c:1.4 Sat Apr 2 00:57:35 2011
+++ src/external/cddl/osnet/sys/kern/vfs.c Mon Nov 25 17:48:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs.c,v 1.4 2011/04/02 04:57:35 rmind Exp $ */
+/* $NetBSD: vfs.c,v 1.5 2013/11/25 22:48:05 christos Exp $ */
/*-
* Copyright (c) 2006-2007 Pawel Jakub Dawidek
@@ -324,9 +324,7 @@ domount(kthread_t *td, vnode_t *vp, cons
vp->v_iflag &= ~VI_MOUNT;
simple_unlock(&vp->v_interlock);
vp->v_mountedhere = mp;
- mutex_enter(&mountlist_lock);
- CIRCLEQ_INSERT_TAIL(&mountlist, mp, mnt_list);
- mutex_exit(&mountlist_lock);
+ mountlist_append(mp);
vfs_event_signal(NULL, VQ_MOUNT, 0);
if (VFS_ROOT(mp, LK_EXCLUSIVE, &mvp, td))
panic("mount: lost mount");
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Mon Sep 23 20:44:24 UTC 2013 Modified Files: src/external/cddl/osnet/sys/sys: vnode.h Log Message: don't use IO_APPEND. In the vdev_file.c we end up appending to our virtual file as a filesystem! With this change: $ dd if=/dev/zero of=disk1 count=266144 $ zpool create crap $PWD/disk1 mounts /crap and it seems to work ok, until I try unmounting To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/cddl/osnet/sys/sys/vnode.h 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.10 src/external/cddl/osnet/sys/sys/vnode.h:1.11 --- src/external/cddl/osnet/sys/sys/vnode.h:1.10 Mon Sep 23 15:44:21 2013 +++ src/external/cddl/osnet/sys/sys/vnode.h Mon Sep 23 16:44:24 2013 @@ -1,5 +1,5 @@ -/* $NetBSD: vnode.h,v 1.10 2013/09/23 19:44:21 christos Exp $ */ +/* $NetBSD: vnode.h,v 1.11 2013/09/23 20:44:24 christos Exp $ */ /* * CDDL HEADER START @@ -577,7 +577,7 @@ zfs_vn_rdwr(enum uio_rw rw, vnode_t *vp, ASSERT(ioflag == 0); ASSERT(ulimit == RLIM64_INFINITY); - ioflag = IO_APPEND | IO_UNIT; + ioflag = IO_UNIT; error = vn_rdwr(rw, vp, base, len, offset, seg, ioflag, cr, &resid, curlwp);
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: christos
Date: Mon Sep 23 19:44:21 UTC 2013
Modified Files:
src/external/cddl/osnet/sys/sys: vnode.h
Log Message:
Hack: Instead of dying in vrele with a kernel assertion, detect that the
usecount of the vnode is 0 and treat it as a noop. This is wrong, buf it
get us through the VN_RELE() after the close in vdev_file.c
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/cddl/osnet/sys/sys/vnode.h
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.9 src/external/cddl/osnet/sys/sys/vnode.h:1.10
--- src/external/cddl/osnet/sys/sys/vnode.h:1.9 Sun Jun 12 00:43:11 2011
+++ src/external/cddl/osnet/sys/sys/vnode.h Mon Sep 23 15:44:21 2013
@@ -1,5 +1,5 @@
-/* $NetBSD: vnode.h,v 1.9 2011/06/12 04:43:11 mrg Exp $ */
+/* $NetBSD: vnode.h,v 1.10 2013/09/23 19:44:21 christos Exp $ */
/*
* CDDL HEADER START
@@ -294,7 +294,12 @@ int vn_is_readonly(vnode_t *);
#define vn_renamepath(tdvp, svp, tnm, lentnm) do { } while (0)
#define VN_HOLD(v) vref(v)
-#define VN_RELE(v) vrele(v)
+#define VN_RELE(v) do { \
+ if ((v)->v_usecount == 0) \
+ printf("%s, %d: %p unused\n", __FILE__, __LINE__, v); \
+ else \
+ vrele(v); \
+} while (/*CONSTCOND*/0)
#define VN_URELE(v) vput(v)
#define VN_SET_VFS_TYPE_DEV(vp, vfs, type, flag) (0)
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: dsl Date: Thu Jan 3 17:12:05 UTC 2013 Modified Files: src/external/cddl/osnet/sys/sys: random.h Log Message: Spell cprng_fast() properly To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/random.h 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/random.h diff -u src/external/cddl/osnet/sys/sys/random.h:1.4 src/external/cddl/osnet/sys/sys/random.h:1.5 --- src/external/cddl/osnet/sys/sys/random.h:1.4 Thu Jan 3 16:42:55 2013 +++ src/external/cddl/osnet/sys/sys/random.h Thu Jan 3 17:12:05 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: random.h,v 1.4 2013/01/03 16:42:55 dsl Exp $ */ +/* $NetBSD: random.h,v 1.5 2013/01/03 17:12:05 dsl Exp $ */ /*- * Copyright (c) 2007 Pawel Jakub Dawidek @@ -33,7 +33,7 @@ #include -#define random_get_bytes(p, s) cprgn_fast(p, s) -#define random_get_pseudo_bytes(p, s) cprgn_fast(p, s) +#define random_get_bytes(p, s) cprng_fast(p, s) +#define random_get_pseudo_bytes(p, s) cprng_fast(p, s) #endif /* !_OPENSOLARIS_SYS_RANDOM_H_ */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: dsl Date: Thu Jan 3 16:42:55 UTC 2013 Modified Files: src/external/cddl/osnet/sys/sys: random.h Log Message: Use cprgn_fast() not rnd_extract_data(). The latter isn't in any header files any more. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/sys/random.h 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/random.h diff -u src/external/cddl/osnet/sys/sys/random.h:1.3 src/external/cddl/osnet/sys/sys/random.h:1.4 --- src/external/cddl/osnet/sys/sys/random.h:1.3 Sun Feb 21 01:46:36 2010 +++ src/external/cddl/osnet/sys/sys/random.h Thu Jan 3 16:42:55 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: random.h,v 1.3 2010/02/21 01:46:36 darran Exp $ */ +/* $NetBSD: random.h,v 1.4 2013/01/03 16:42:55 dsl Exp $ */ /*- * Copyright (c) 2007 Pawel Jakub Dawidek @@ -31,9 +31,9 @@ #ifndef _OPENSOLARIS_SYS_RANDOM_H_ #define _OPENSOLARIS_SYS_RANDOM_H_ -#include +#include -#define random_get_bytes(p, s) rnd_extract_data((p), (uint32_t)(s), 0) -#define random_get_pseudo_bytes(p, s) rnd_extract_data((p), (uint32_t)(s), 0) +#define random_get_bytes(p, s) cprgn_fast(p, s) +#define random_get_pseudo_bytes(p, s) cprgn_fast(p, s) #endif /* !_OPENSOLARIS_SYS_RANDOM_H_ */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: dsl
Date: Wed Jan 2 10:33:19 UTC 2013
Modified Files:
src/external/cddl/osnet/sys/sys: zfs_context.h
Log Message:
Replace alloca(256) with an array.
The code ended up using alloca() from libc - which 'just can't work' (tm).
It is also pointless!
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/cddl/osnet/sys/sys/zfs_context.h
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/zfs_context.h
diff -u src/external/cddl/osnet/sys/sys/zfs_context.h:1.12 src/external/cddl/osnet/sys/sys/zfs_context.h:1.13
--- src/external/cddl/osnet/sys/sys/zfs_context.h:1.12 Mon Nov 21 17:51:03 2011
+++ src/external/cddl/osnet/sys/sys/zfs_context.h Wed Jan 2 10:33:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: zfs_context.h,v 1.12 2011/11/21 17:51:03 christos Exp $ */
+/* $NetBSD: zfs_context.h,v 1.13 2013/01/02 10:33:19 dsl Exp $ */
/*
* CDDL HEADER START
@@ -146,7 +146,7 @@ extern void vcmn_err(int, const char *,
const TYPE __left = (TYPE)(LEFT); \
const TYPE __right = (TYPE)(RIGHT); \
if (!(__left OP __right)) { \
- char *__buf = alloca(256); \
+ char __buf[256]; \
(void) snprintf(__buf, 256, "%s %s %s (0x%llx %s 0x%llx)", \
#LEFT, #OP, #RIGHT, \
(u_longlong_t)__left, #OP, (u_longlong_t)__right); \
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: riastradh Date: Sat Oct 20 22:11:38 UTC 2012 Modified Files: src/external/cddl/osnet/sys/sys: mount.h Log Message: Use 0 for MS_NOMNTTAB since we have no mnttab anyway. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/sys/sys/mount.h 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/mount.h diff -u src/external/cddl/osnet/sys/sys/mount.h:1.5 src/external/cddl/osnet/sys/sys/mount.h:1.6 --- src/external/cddl/osnet/sys/sys/mount.h:1.5 Sat Oct 20 11:37:37 2012 +++ src/external/cddl/osnet/sys/sys/mount.h Sat Oct 20 22:11:38 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mount.h,v 1.5 2012/10/20 11:37:37 joerg Exp $ */ +/* $NetBSD: mount.h,v 1.6 2012/10/20 22:11:38 riastradh Exp $ */ /*- * Copyright (c) 2007 Pawel Jakub Dawidek @@ -37,7 +37,7 @@ #define MS_FORCE MNT_FORCE #define MS_REMOUNT MNT_UPDATE #define MS_OPTIONSTR __MNT_UNUSED1 -#define MS_NOMNTTAB __MNT_UNUSED1 +#define MS_NOMNTTAB 0 /* We don't have any mnttab anyway. */ typedef struct fid fid_t;
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: joerg Date: Sat Oct 20 11:37:42 UTC 2012 Modified Files: src/external/cddl/osnet/sys/sys: mount.h Log Message: Hack to avoid missing macro to unbuild the tree. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/mount.h 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/mount.h diff -u src/external/cddl/osnet/sys/sys/mount.h:1.4 src/external/cddl/osnet/sys/sys/mount.h:1.5 --- src/external/cddl/osnet/sys/sys/mount.h:1.4 Sun Feb 28 14:45:47 2010 +++ src/external/cddl/osnet/sys/sys/mount.h Sat Oct 20 11:37:37 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mount.h,v 1.4 2010/02/28 14:45:47 haad Exp $ */ +/* $NetBSD: mount.h,v 1.5 2012/10/20 11:37:37 joerg Exp $ */ /*- * Copyright (c) 2007 Pawel Jakub Dawidek @@ -37,7 +37,7 @@ #define MS_FORCE MNT_FORCE #define MS_REMOUNT MNT_UPDATE #define MS_OPTIONSTR __MNT_UNUSED1 -#define MS_NOMNTTAB __MNT_UNUSED2 +#define MS_NOMNTTAB __MNT_UNUSED1 typedef struct fid fid_t;
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src
Committed By: riastradh
Date: Fri Oct 19 22:19:15 UTC 2012
Modified Files:
src/external/cddl/osnet/sys/kern: policy.c
Log Message:
Let's try that again without the static...
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/sys/kern/policy.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/kern/policy.c
diff -u src/external/cddl/osnet/sys/kern/policy.c:1.5 src/external/cddl/osnet/sys/kern/policy.c:1.6
--- src/external/cddl/osnet/sys/kern/policy.c:1.5 Fri Oct 19 19:58:33 2012
+++ src/external/cddl/osnet/sys/kern/policy.c Fri Oct 19 22:19:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: policy.c,v 1.5 2012/10/19 19:58:33 riastradh Exp $ */
+/* $NetBSD: policy.c,v 1.6 2012/10/19 22:19:15 riastradh Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -205,7 +205,7 @@ secpolicy_vnode_create_gid(kauth_cred_t
return kauth_authorize_generic(cred, KAUTH_GENERIC_ISSUSER, NULL);
}
-static int
+int
secpolicy_vnode_utime_modify(kauth_cred_t cred)
{
CVS commit: src/external/cddl/osnet/sys
Module Name:src
Committed By: riastradh
Date: Fri Oct 19 19:58:33 UTC 2012
Modified Files:
src/external/cddl/osnet/sys/kern: policy.c
src/external/cddl/osnet/sys/sys: policy.h
Log Message:
Add omitted secpolicy_vnode_utime_modify, for zfs.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/kern/policy.c
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/policy.h
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/kern/policy.c
diff -u src/external/cddl/osnet/sys/kern/policy.c:1.4 src/external/cddl/osnet/sys/kern/policy.c:1.5
--- src/external/cddl/osnet/sys/kern/policy.c:1.4 Thu Oct 18 14:22:58 2012
+++ src/external/cddl/osnet/sys/kern/policy.c Fri Oct 19 19:58:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: policy.c,v 1.4 2012/10/18 14:22:58 riastradh Exp $ */
+/* $NetBSD: policy.c,v 1.5 2012/10/19 19:58:33 riastradh Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -205,6 +205,13 @@ secpolicy_vnode_create_gid(kauth_cred_t
return kauth_authorize_generic(cred, KAUTH_GENERIC_ISSUSER, NULL);
}
+static int
+secpolicy_vnode_utime_modify(kauth_cred_t cred)
+{
+
+ return kauth_authorize_generic(cred, KAUTH_GENERIC_ISSUSER, NULL);
+}
+
int
secpolicy_vnode_setdac(kauth_cred_t cred, uid_t owner)
{
Index: src/external/cddl/osnet/sys/sys/policy.h
diff -u src/external/cddl/osnet/sys/sys/policy.h:1.6 src/external/cddl/osnet/sys/sys/policy.h:1.7
--- src/external/cddl/osnet/sys/sys/policy.h:1.6 Thu Oct 18 14:22:58 2012
+++ src/external/cddl/osnet/sys/sys/policy.h Fri Oct 19 19:58:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: policy.h,v 1.6 2012/10/18 14:22:58 riastradh Exp $ */
+/* $NetBSD: policy.h,v 1.7 2012/10/19 19:58:33 riastradh Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -60,6 +60,7 @@ int secpolicy_vnode_setattr(kauth_cred_t
struct vattr *vap, const struct vattr *ovap, int flags,
int unlocked_access(void *, int, kauth_cred_t), void *node);
int secpolicy_vnode_create_gid(kauth_cred_t cred);
+int secpolicy_vnode_utime_modify(kauth_cred_t cred);
int secpolicy_vnode_setids_setgids(kauth_cred_t cred, gid_t gid);
int secpolicy_vnode_setid_retain(kauth_cred_t cred, boolean_t issuidroot);
void secpolicy_setid_clear(struct vattr *vap, kauth_cred_t cred);
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src
Committed By: riastradh
Date: Mon Oct 15 22:50:25 UTC 2012
Modified Files:
src/external/cddl/osnet/sys/kern: policy.c
Log Message:
secpolicy_vnode_access must be called with the vnode lock held.
Don't unlock the vnode and then tell the caller about what the world
was like while the vnode was locked. The world changes fast.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/kern/policy.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/kern/policy.c
diff -u src/external/cddl/osnet/sys/kern/policy.c:1.2 src/external/cddl/osnet/sys/kern/policy.c:1.3
--- src/external/cddl/osnet/sys/kern/policy.c:1.2 Thu Jun 24 13:03:05 2010
+++ src/external/cddl/osnet/sys/kern/policy.c Mon Oct 15 22:50:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: policy.c,v 1.2 2010/06/24 13:03:05 hannken Exp $ */
+/* $NetBSD: policy.c,v 1.3 2012/10/15 22:50:25 riastradh Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -143,12 +143,10 @@ int
secpolicy_vnode_access(kauth_cred_t cred, struct vnode *vp, uint64_t owner,
int mode)
{
- int error;
- vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
- error = VOP_ACCESS(vp, mode, cred);
- VOP_UNLOCK(vp);
- return error;
+ (void)owner; /* XXX ignore? */
+ KASSERT(VOP_ISLOCKED(vp));
+ return VOP_ACCESS(vp, mode, cred);
}
/*
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src
Committed By: njoly
Date: Thu Oct 11 08:01:23 UTC 2012
Modified Files:
src/external/cddl/osnet/sys/kern: kobj.c
Log Message:
No need to include files more than once.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/kern/kobj.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/kern/kobj.c
diff -u src/external/cddl/osnet/sys/kern/kobj.c:1.3 src/external/cddl/osnet/sys/kern/kobj.c:1.4
--- src/external/cddl/osnet/sys/kern/kobj.c:1.3 Thu Apr 26 23:34:09 2012
+++ src/external/cddl/osnet/sys/kern/kobj.c Thu Oct 11 08:01:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj.c,v 1.3 2012/04/26 23:34:09 christos Exp $ */
+/* $NetBSD: kobj.c,v 1.4 2012/10/11 08:01:23 njoly Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -57,19 +57,17 @@
#include
/* __FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.4 2007/05/31 11:51:49 kib Exp $"); */
-__KERNEL_RCSID(0, "$NetBSD: kobj.c,v 1.3 2012/04/26 23:34:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj.c,v 1.4 2012/10/11 08:01:23 njoly Exp $");
#include
#include
#include
-#include
#include
#include
#include
#include
#include
#include
-#include
void
kobj_free(void *address, size_t size)
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src Committed By: njoly Date: Tue Jun 19 21:25:26 UTC 2012 Modified Files: src/external/cddl/osnet/sys/kern: kstat.c Log Message: Use CTLTYPE_QUAD for uint64_t type in sysctl_createv. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/kern/kstat.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/kern/kstat.c diff -u src/external/cddl/osnet/sys/kern/kstat.c:1.1 src/external/cddl/osnet/sys/kern/kstat.c:1.2 --- src/external/cddl/osnet/sys/kern/kstat.c:1.1 Fri Aug 7 20:57:57 2009 +++ src/external/cddl/osnet/sys/kern/kstat.c Tue Jun 19 21:25:26 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: kstat.c,v 1.1 2009/08/07 20:57:57 haad Exp $ */ +/* $NetBSD: kstat.c,v 1.2 2012/06/19 21:25:26 njoly Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -113,7 +113,7 @@ kstat_install(kstat_t *ks) KASSERT(ksent->data_type == KSTAT_DATA_UINT64); sysctl_createv(&ks->ks_clog, 0, &ks->ks_node, NULL, CTLFLAG_PERMANENT | CTLFLAG_READONLY, - CTLTYPE_INT, ksent->name, NULL, + CTLTYPE_QUAD, ksent->name, NULL, NULL, 0, &ksent->value.ui64, 0, CTL_CREATE, CTL_EOL); }
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src
Committed By: christos
Date: Thu Apr 26 23:34:09 UTC 2012
Modified Files:
src/external/cddl/osnet/sys/kern: kobj.c
Log Message:
Add FREAD for the benefit of kauth!
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/kern/kobj.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/kern/kobj.c
diff -u src/external/cddl/osnet/sys/kern/kobj.c:1.2 src/external/cddl/osnet/sys/kern/kobj.c:1.3
--- src/external/cddl/osnet/sys/kern/kobj.c:1.2 Fri Jan 21 07:24:24 2011
+++ src/external/cddl/osnet/sys/kern/kobj.c Thu Apr 26 19:34:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj.c,v 1.2 2011/01/21 12:24:24 pooka Exp $ */
+/* $NetBSD: kobj.c,v 1.3 2012/04/26 23:34:09 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
/* __FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.4 2007/05/31 11:51:49 kib Exp $"); */
-__KERNEL_RCSID(0, "$NetBSD: kobj.c,v 1.2 2011/01/21 12:24:24 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj.c,v 1.3 2012/04/26 23:34:09 christos Exp $");
#include
#include
@@ -97,7 +97,7 @@ kobj_open_file_vnode(const char *file)
{
vnode_t *vp;
- if (vn_open(file, UIO_SYSSPACE, FCREAT, 0, &vp, CRCREAT, 0) != 0) {
+ if (vn_open(file, UIO_SYSSPACE, FREAD|FCREAT, 0, &vp, CRCREAT, 0) != 0) {
return NULL;
}
return vp;
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Mon Nov 21 05:50:12 UTC 2011 Modified Files: src/external/cddl/osnet/sys/sys: zfs_context.h Log Message: correct declaration of vn_close() XXX: Should all those dup declarations be here? To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/cddl/osnet/sys/sys/zfs_context.h 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/zfs_context.h diff -u src/external/cddl/osnet/sys/sys/zfs_context.h:1.10 src/external/cddl/osnet/sys/sys/zfs_context.h:1.11 --- src/external/cddl/osnet/sys/sys/zfs_context.h:1.10 Sun Jul 17 16:54:33 2011 +++ src/external/cddl/osnet/sys/sys/zfs_context.h Mon Nov 21 00:50:11 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: zfs_context.h,v 1.10 2011/07/17 20:54:33 joerg Exp $ */ +/* $NetBSD: zfs_context.h,v 1.11 2011/11/21 05:50:11 christos Exp $ */ /* * CDDL HEADER START @@ -380,7 +380,7 @@ extern int vn_openat(char *path, int x1, int x2, int x3, vnode_t *vp, int unk); extern int vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset, int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp); -extern void vn_close(vnode_t *vp); +extern void vn_close(vnode_t *vp, int flags, kauth_cred_t cred); extern int vn_getattr(vnode_t *vp, vattr_t *va); #define vn_remove(path, x1, x2) remove(path)
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: mrg Date: Sun Jun 12 04:43:11 UTC 2011 Modified Files: src/external/cddl/osnet/sys/sys: vnode.h Log Message: v_interlock is now a pointer to kmutex_t, use it as one. fixes many of the 5.99.53 build issues in zfs, but not all of them. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/sys/sys/vnode.h 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.8 src/external/cddl/osnet/sys/sys/vnode.h:1.9 --- src/external/cddl/osnet/sys/sys/vnode.h:1.8 Fri Jan 21 12:24:24 2011 +++ src/external/cddl/osnet/sys/sys/vnode.h Sun Jun 12 04:43:11 2011 @@ -1,5 +1,5 @@ -/* $NetBSD: vnode.h,v 1.8 2011/01/21 12:24:24 pooka Exp $ */ +/* $NetBSD: vnode.h,v 1.9 2011/06/12 04:43:11 mrg Exp $ */ /* * CDDL HEADER START @@ -298,8 +298,8 @@ #define VN_URELE(v) vput(v) #define VN_SET_VFS_TYPE_DEV(vp, vfs, type, flag) (0) -#define VI_LOCK(vp) mutex_enter(&(vp)->v_interlock) -#define VI_UNLOCK(vp) mutex_exit(&(vp)->v_interlock) +#define VI_LOCK(vp) mutex_enter((vp)->v_interlock) +#define VI_UNLOCK(vp) mutex_exit((vp)->v_interlock) #define VOP_REALVP(vp, vpp, ct) (*(vpp) = (vp), 0) @@ -654,7 +654,7 @@ nbflag |= PGO_CLEANIT; } - mutex_enter(&vp->v_interlock); + mutex_enter(vp->v_interlock); return VOP_PUTPAGES(vp, off, len, nbflag); } #define VOP_PUTPAGE(vp, off, len, flag, cr, ct) zfs_vop_putpage((vp), (off), (len), (flag))
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src Committed By: pooka Date: Thu Mar 10 19:35:24 UTC 2011 Modified Files: src/external/cddl/osnet/sys/kern: misc.c Log Message: adjust some pretty likely broken assertion (stksize is hardcoded from caller, but not used here). now zpool doesn't cause a kernel crash anymore. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/kern/misc.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/kern/misc.c diff -u src/external/cddl/osnet/sys/kern/misc.c:1.2 src/external/cddl/osnet/sys/kern/misc.c:1.3 --- src/external/cddl/osnet/sys/kern/misc.c:1.2 Sun Feb 28 14:45:47 2010 +++ src/external/cddl/osnet/sys/kern/misc.c Thu Mar 10 19:35:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: misc.c,v 1.2 2010/02/28 14:45:47 haad Exp $ */ +/* $NetBSD: misc.c,v 1.3 2011/03/10 19:35:24 pooka Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -90,7 +90,8 @@ int error; lwp_t *thr; - ASSERT(stk == NULL && stksize == 0 && len == 0); + //ASSERT(stk == NULL && stksize == 0 && len == 0); + ASSERT(stk == NULL && len == 0); ASSERT(state == TS_RUN); error = kthread_create(pri, KTHREAD_MPSAFE, NULL,
CVS commit: src/external/cddl/osnet/sys
Module Name:src
Committed By: pooka
Date: Fri Jan 21 12:24:25 UTC 2011
Modified Files:
src/external/cddl/osnet/sys/kern: kobj.c
src/external/cddl/osnet/sys/sys: vnode.h
Log Message:
fix kobj_open_file_vnode()
patch from haad
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/kern/kobj.c
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/vnode.h
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/kern/kobj.c
diff -u src/external/cddl/osnet/sys/kern/kobj.c:1.1 src/external/cddl/osnet/sys/kern/kobj.c:1.2
--- src/external/cddl/osnet/sys/kern/kobj.c:1.1 Fri Aug 7 20:57:57 2009
+++ src/external/cddl/osnet/sys/kern/kobj.c Fri Jan 21 12:24:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj.c,v 1.1 2009/08/07 20:57:57 haad Exp $ */
+/* $NetBSD: kobj.c,v 1.2 2011/01/21 12:24:24 pooka Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
/* __FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.4 2007/05/31 11:51:49 kib Exp $"); */
-__KERNEL_RCSID(0, "$NetBSD: kobj.c,v 1.1 2009/08/07 20:57:57 haad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj.c,v 1.2 2011/01/21 12:24:24 pooka Exp $");
#include
#include
@@ -97,7 +97,7 @@
{
vnode_t *vp;
- if (vn_open(file, UIO_SYSSPACE, 0, 0, &vp, CRCREAT, 0) != 0) {
+ if (vn_open(file, UIO_SYSSPACE, FCREAT, 0, &vp, CRCREAT, 0) != 0) {
return NULL;
}
return vp;
Index: src/external/cddl/osnet/sys/sys/vnode.h
diff -u src/external/cddl/osnet/sys/sys/vnode.h:1.7 src/external/cddl/osnet/sys/sys/vnode.h:1.8
--- src/external/cddl/osnet/sys/sys/vnode.h:1.7 Tue Dec 14 01:21:02 2010
+++ src/external/cddl/osnet/sys/sys/vnode.h Fri Jan 21 12:24:24 2011
@@ -1,5 +1,5 @@
-/* $NetBSD: vnode.h,v 1.7 2010/12/14 01:21:02 haad Exp $ */
+/* $NetBSD: vnode.h,v 1.8 2011/01/21 12:24:24 pooka Exp $ */
/*
* CDDL HEADER START
@@ -536,7 +536,7 @@
int error;
ASSERT(seg == UIO_SYSSPACE);
- ASSERT(filemode == (FWRITE | FCREAT | FTRUNC | FOFFMAX));
+ ASSERT((filemode & (FWRITE | FCREAT | FTRUNC | FOFFMAX)) != 0);
ASSERT(crwhy == CRCREAT);
ASSERT(umask == 0);
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: haad Date: Tue Dec 28 16:44:45 UTC 2010 Modified Files: src/external/cddl/osnet/sys/sys: zfs_context.h Log Message: Define vn_getattr in zfs_context.h. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/sys/sys/zfs_context.h 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/zfs_context.h diff -u src/external/cddl/osnet/sys/sys/zfs_context.h:1.8 src/external/cddl/osnet/sys/sys/zfs_context.h:1.9 --- src/external/cddl/osnet/sys/sys/zfs_context.h:1.8 Tue Dec 28 13:36:09 2010 +++ src/external/cddl/osnet/sys/sys/zfs_context.h Tue Dec 28 16:44:45 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: zfs_context.h,v 1.8 2010/12/28 13:36:09 haad Exp $ */ +/* $NetBSD: zfs_context.h,v 1.9 2010/12/28 16:44:45 haad Exp $ */ /* * CDDL HEADER START @@ -381,6 +381,7 @@ extern int vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset, int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp); extern void vn_close(vnode_t *vp); +extern int vn_getattr(vnode_t *vp, vattr_t *va); #define vn_remove(path, x1, x2) remove(path) #define vn_rename(from, to, seg) rename((from), (to))
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: haad Date: Tue Dec 14 01:23:44 UTC 2010 Modified Files: src/external/cddl/osnet/sys/sys: zfs_context.h Log Message: Remove now unneeded print_timestamp. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/zfs_context.h 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/zfs_context.h diff -u src/external/cddl/osnet/sys/sys/zfs_context.h:1.6 src/external/cddl/osnet/sys/sys/zfs_context.h:1.7 --- src/external/cddl/osnet/sys/sys/zfs_context.h:1.6 Sun Feb 28 14:45:47 2010 +++ src/external/cddl/osnet/sys/sys/zfs_context.h Tue Dec 14 01:23:43 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: zfs_context.h,v 1.6 2010/02/28 14:45:47 haad Exp $ */ +/* $NetBSD: zfs_context.h,v 1.7 2010/12/14 01:23:43 haad Exp $ */ /* * CDDL HEADER START @@ -570,10 +570,6 @@ extern char *kmem_asprintf(const char *fmt, ...); #define strfree(str) kmem_free((str), strlen(str)+1) -//#define print_timestamp(a) 0 - -extern void print_timestamp(int); - #define DEV_PHYS_PATH "phys_path" #define DDI_SLEEP KM_SLEEP
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: haad Date: Tue Dec 14 01:21:25 UTC 2010 Modified Files: src/external/cddl/osnet/sys/sys: uio.h Log Message: Do not include debug.h To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/uio.h 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/uio.h diff -u src/external/cddl/osnet/sys/sys/uio.h:1.4 src/external/cddl/osnet/sys/sys/uio.h:1.5 --- src/external/cddl/osnet/sys/sys/uio.h:1.4 Sun Feb 28 14:45:47 2010 +++ src/external/cddl/osnet/sys/sys/uio.h Tue Dec 14 01:21:25 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: uio.h,v 1.4 2010/02/28 14:45:47 haad Exp $ */ +/* $NetBSD: uio.h,v 1.5 2010/12/14 01:21:25 haad Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ #include_next #include -#include + #ifndef _KERNEL #include
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: haad
Date: Tue Dec 14 01:21:03 UTC 2010
Modified Files:
src/external/cddl/osnet/sys/sys: vnode.h
Log Message:
Add some more solaris vnode defs for zfs_ctldir.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/vnode.h
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.6 src/external/cddl/osnet/sys/sys/vnode.h:1.7
--- src/external/cddl/osnet/sys/sys/vnode.h:1.6 Fri Nov 19 06:44:33 2010
+++ src/external/cddl/osnet/sys/sys/vnode.h Tue Dec 14 01:21:02 2010
@@ -1,5 +1,5 @@
-/* $NetBSD: vnode.h,v 1.6 2010/11/19 06:44:33 dholland Exp $ */
+/* $NetBSD: vnode.h,v 1.7 2010/12/14 01:21:02 haad Exp $ */
/*
* CDDL HEADER START
@@ -108,6 +108,8 @@
#include
#include
#include
+#include
+
#ifdef _KERNEL
#include
@@ -117,7 +119,7 @@
typedef enum vtype vtype_t;
typedef void caller_context_t;
-typedef int (**vnodeops_t)(void *);
+typedef int (**vnodeops_t)(void *);
#define vop_fid vop_vptofh
#define vop_fid_args vop_vptofh_args
@@ -156,6 +158,9 @@
uint_t vsa_aclflags; /* ACE ACL flags */
} vsecattr_t;
+#define V_XATTRDIR 0x /* attribute unnamed directory */
+#define IS_XATTRDIR(vp) (0)
+
#define AV_SCANSTAMP_SZ 32 /* length of anti-virus scanstamp */
/*
@@ -265,8 +270,22 @@
#define v_lock v_interlock
+/*
+ * vnode flags.
+ */
+#define VROOT VV_ROOT/* root of its file system */
+#define VNOCACHE 0x00/* don't keep cache pages on vnode */
+#define VNOMAP VV_MAPPED/* file cannot be mapped/faulted */
+#define VDUP 0x00/* file should be dup'ed rather then opened */
+#define VNOSWAP 0x00/* file cannot be used as virtual swap device */
+#define VNOMOUNT 0x00/* file cannot be covered by mount */
+#define VISSWAP 0x00/* vnode is being used for swap */
+#define VSWAPLIKE 0x00/* vnode acts like swap (but may not be) */
+
int vn_is_readonly(vnode_t *);
+#define vn_free(vp) vrele((vp))
+#define vn_setops(vp, ops) (0)
#define vn_vfswlock(vp) (0)
#define vn_vfsunlock(vp) do { } while (0)
#define vn_ismntpt(vp) ((vp)->v_type == VDIR && (vp)->v_mountedhere != NULL)
@@ -277,6 +296,7 @@
#define VN_HOLD(v) vref(v)
#define VN_RELE(v) vrele(v)
#define VN_URELE(v) vput(v)
+#define VN_SET_VFS_TYPE_DEV(vp, vfs, type, flag) (0)
#define VI_LOCK(vp) mutex_enter(&(vp)->v_interlock)
#define VI_UNLOCK(vp) mutex_exit(&(vp)->v_interlock)
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src Committed By: haad Date: Tue Dec 14 01:18:34 UTC 2010 Modified Files: src/external/cddl/osnet/sys/kern: ddi.c Log Message: Include sys/debug.h to get ASSERT defined. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/kern/ddi.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/kern/ddi.c diff -u src/external/cddl/osnet/sys/kern/ddi.c:1.3 src/external/cddl/osnet/sys/kern/ddi.c:1.4 --- src/external/cddl/osnet/sys/kern/ddi.c:1.3 Sun Feb 28 14:45:47 2010 +++ src/external/cddl/osnet/sys/kern/ddi.c Tue Dec 14 01:18:34 2010 @@ -32,6 +32,7 @@ #include #include +#include #include #include #include
CVS commit: src/external/cddl/osnet/sys
Module Name:src
Committed By: haad
Date: Tue Dec 14 01:01:41 UTC 2010
Modified Files:
src/external/cddl/osnet/sys/kern: string.c
src/external/cddl/osnet/sys/sys: string.h
Log Message:
Simple routine to convert long to string.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/kern/string.c
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/sys/string.h
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/kern/string.c
diff -u src/external/cddl/osnet/sys/kern/string.c:1.1 src/external/cddl/osnet/sys/kern/string.c:1.2
--- src/external/cddl/osnet/sys/kern/string.c:1.1 Fri Aug 7 20:57:57 2009
+++ src/external/cddl/osnet/sys/kern/string.c Tue Dec 14 01:01:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: string.c,v 1.1 2009/08/07 20:57:57 haad Exp $ */
+/* $NetBSD: string.c,v 1.2 2010/12/14 01:01:40 haad Exp $ */
/*
* CDDL HEADER START
@@ -71,3 +71,25 @@
}
*s = 0;
}
+
+/*
+ * Simple-minded conversion of a long into a null-terminated character
+ * string. Caller must ensure there's enough space to hold the result.
+ */
+void
+numtos(unsigned long num, char *s)
+{
+ char prbuf[40];
+
+ char *cp = prbuf;
+
+ do {
+ *cp++ = "0123456789"[num % 10];
+ num /= 10;
+ } while (num);
+
+ do {
+ *s++ = *--cp;
+ } while (cp > prbuf);
+ *s = '\0';
+}
Index: src/external/cddl/osnet/sys/sys/string.h
diff -u src/external/cddl/osnet/sys/sys/string.h:1.3 src/external/cddl/osnet/sys/sys/string.h:1.4
--- src/external/cddl/osnet/sys/sys/string.h:1.3 Sun Feb 21 01:46:36 2010
+++ src/external/cddl/osnet/sys/sys/string.h Tue Dec 14 01:01:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: string.h,v 1.3 2010/02/21 01:46:36 darran Exp $ */
+/* $NetBSD: string.h,v 1.4 2010/12/14 01:01:41 haad Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -33,5 +33,6 @@
char *strpbrk(const char *, const char *);
void strident_canon(char *s, size_t n);
+void numtos(unsigned long num, char *s);
#endif /* _OPENSOLARIS_SYS_STRING_H_ */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: haad
Date: Tue Dec 14 01:00:26 UTC 2010
Modified Files:
src/external/cddl/osnet/sys/sys: mnttab.h
Log Message:
NetBSD doesn't have /etc/mnttab replace it with /dev/null.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/sys/mnttab.h
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/mnttab.h
diff -u src/external/cddl/osnet/sys/sys/mnttab.h:1.3 src/external/cddl/osnet/sys/sys/mnttab.h:1.4
--- src/external/cddl/osnet/sys/sys/mnttab.h:1.3 Sun Feb 21 01:46:36 2010
+++ src/external/cddl/osnet/sys/sys/mnttab.h Tue Dec 14 01:00:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mnttab.h,v 1.3 2010/02/21 01:46:36 darran Exp $ */
+/* $NetBSD: mnttab.h,v 1.4 2010/12/14 01:00:26 haad Exp $ */
/*
* CDDL HEADER START
@@ -42,7 +42,7 @@
extern "C" {
#endif
-#define MNTTAB "/etc/mnttab"
+#define MNTTAB "/dev/null"
#define MNT_LINE_MAX 1024
#define MNT_TOOLONG 1 /* entry exceeds MNT_LINE_MAX */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: christos
Date: Fri Mar 26 21:33:28 UTC 2010
Modified Files:
src/external/cddl/osnet/sys/sys: time.h
Log Message:
deal with missing CLOCK_REALTIME
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/sys/time.h
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/time.h
diff -u src/external/cddl/osnet/sys/sys/time.h:1.3 src/external/cddl/osnet/sys/sys/time.h:1.4
--- src/external/cddl/osnet/sys/sys/time.h:1.3 Sat Feb 20 20:46:36 2010
+++ src/external/cddl/osnet/sys/sys/time.h Fri Mar 26 17:33:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.3 2010/02/21 01:46:36 darran Exp $ */
+/* $NetBSD: time.h,v 1.4 2010/03/26 21:33:28 christos Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -67,9 +67,15 @@
#else
static __inline hrtime_t gethrtime(void) {
+#ifdef CLOCK_REALTIME
struct timespec ts;
clock_gettime(CLOCK_REALTIME,&ts);
return (((u_int64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec);
+#else
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ return (((u_int64_t) tv.tv_sec) * MICROSEC + tv.tv_usec) * 1000;
+#endif
}
#endif /* _KERNEL */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: darran Date: Sun Feb 21 08:28:41 UTC 2010 Removed Files: src/external/cddl/osnet/sys/sys: file.h Log Message: DTrace: remove file.h - it shouldn't have been added and breaks zfs. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/external/cddl/osnet/sys/sys/file.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: ober Date: Fri Jan 8 03:41:59 UTC 2010 Modified Files: src/external/cddl/osnet/sys/sys: kmem.h Log Message: Fix comment to meet style guidelines. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/sys/kmem.h 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/kmem.h diff -u src/external/cddl/osnet/sys/sys/kmem.h:1.3 src/external/cddl/osnet/sys/sys/kmem.h:1.4 --- src/external/cddl/osnet/sys/sys/kmem.h:1.3 Sun Jan 3 11:33:13 2010 +++ src/external/cddl/osnet/sys/sys/kmem.h Fri Jan 8 03:41:58 2010 @@ -1,5 +1,5 @@ -/* $NetBSD: kmem.h,v 1.3 2010/01/03 11:33:13 ober Exp $ */ +/* $NetBSD: kmem.h,v 1.4 2010/01/08 03:41:58 ober Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -67,7 +67,9 @@ #define kmem_cache_free(cache, buf) pool_cache_put(cache, buf) #define kmem_cache_reap_now(cache) pool_cache_invalidate(cache) -#define KM_PUSHPAGE KM_SLEEP /* XXXNETBSD XXX HACK to prevent the crashes currently seen. Should be revisited once the uvm issues with zfs are fixed. */ +#define KM_PUSHPAGE KM_SLEEP /* XXXNETBSD XXX HACK to prevent the crashes currently seen. + * Should be revisited once the uvm issues with zfs are fixed. + */ #define KMC_NODEBUG 0x00 #endif /* _OPENSOLARIS_SYS_KMEM_H_ */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: ober Date: Sun Jan 3 11:33:13 UTC 2010 Modified Files: src/external/cddl/osnet/sys/sys: kmem.h Log Message: Make sure the comment is specific to being a hack and that it needs to be pulled before production release and the real issues with UVM and ZFS need to be resolved. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/sys/kmem.h 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/kmem.h diff -u src/external/cddl/osnet/sys/sys/kmem.h:1.2 src/external/cddl/osnet/sys/sys/kmem.h:1.3 --- src/external/cddl/osnet/sys/sys/kmem.h:1.2 Sun Jan 3 10:50:06 2010 +++ src/external/cddl/osnet/sys/sys/kmem.h Sun Jan 3 11:33:13 2010 @@ -1,5 +1,5 @@ -/* $NetBSD: kmem.h,v 1.2 2010/01/03 10:50:06 ober Exp $ */ +/* $NetBSD: kmem.h,v 1.3 2010/01/03 11:33:13 ober Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ #define kmem_cache_free(cache, buf) pool_cache_put(cache, buf) #define kmem_cache_reap_now(cache) pool_cache_invalidate(cache) -#define KM_PUSHPAGE KM_SLEEP /* XXXNETBSD XXX to prevent the crashes currently seen.*/ +#define KM_PUSHPAGE KM_SLEEP /* XXXNETBSD XXX HACK to prevent the crashes currently seen. Should be revisited once the uvm issues with zfs are fixed. */ #define KMC_NODEBUG 0x00 #endif /* _OPENSOLARIS_SYS_KMEM_H_ */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: ober Date: Sun Jan 3 10:50:06 UTC 2010 Modified Files: src/external/cddl/osnet/sys/sys: kmem.h Log Message: Set KM_PUSHPAGE to KM_SLEEP to prevent the arc_buf_alloc panics in ZFS. ok haad@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/sys/kmem.h 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/kmem.h diff -u src/external/cddl/osnet/sys/sys/kmem.h:1.1 src/external/cddl/osnet/sys/sys/kmem.h:1.2 --- src/external/cddl/osnet/sys/sys/kmem.h:1.1 Fri Aug 7 20:57:57 2009 +++ src/external/cddl/osnet/sys/sys/kmem.h Sun Jan 3 10:50:06 2010 @@ -1,5 +1,5 @@ -/* $NetBSD: kmem.h,v 1.1 2009/08/07 20:57:57 haad Exp $ */ +/* $NetBSD: kmem.h,v 1.2 2010/01/03 10:50:06 ober Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ #define kmem_cache_free(cache, buf) pool_cache_put(cache, buf) #define kmem_cache_reap_now(cache) pool_cache_invalidate(cache) -#define KM_PUSHPAGE 0x00 /* XXXNETBSD */ +#define KM_PUSHPAGE KM_SLEEP /* XXXNETBSD XXX to prevent the crashes currently seen.*/ #define KMC_NODEBUG 0x00 #endif /* _OPENSOLARIS_SYS_KMEM_H_ */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: haad
Date: Mon Oct 12 10:05:29 UTC 2009
Modified Files:
src/external/cddl/osnet/sys/sys: zfs_context.h
Log Message:
Finaly fix ptob problem. ptob was defined for amd64 and not for i386, and
NetBSD version of ptob is not compatible with Solaris one.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/zfs_context.h
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/zfs_context.h
diff -u src/external/cddl/osnet/sys/sys/zfs_context.h:1.4 src/external/cddl/osnet/sys/sys/zfs_context.h:1.5
--- src/external/cddl/osnet/sys/sys/zfs_context.h:1.4 Sun Oct 11 22:17:57 2009
+++ src/external/cddl/osnet/sys/sys/zfs_context.h Mon Oct 12 10:05:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: zfs_context.h,v 1.4 2009/10/11 22:17:57 haad Exp $ */
+/* $NetBSD: zfs_context.h,v 1.5 2009/10/12 10:05:29 haad Exp $ */
/*
* CDDL HEADER START
@@ -499,10 +499,13 @@
#define ERESTART (-1)
#endif
-#ifndef ptob
-size_t ptob(size_t);
+#ifdef ptob
+#undef ptob
#endif
+size_t ptob(size_t);
+
+
typedef struct ksiddomain {
uint_t kd_ref;
uint_t kd_len;
@@ -613,9 +616,12 @@
#define issig(x) (sigispending(curlwp, 0))
#define ISSIG(thr, why) (sigispending(thr, 0))
#define fm_panic panic
-#ifndef ptob
+
+#ifdef ptob
+#undef ptob
+#endif
#define ptob(x) ((x) * PAGE_SIZE)
-#endif /* ptob */
+
#define strncat(a, b, c) strlcat(a, b, c)
#define tsd_get(x) lwp_getspecific(x)
#define tsd_set(x, y) (lwp_setspecific(x, y), 0)
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: haad Date: Sun Oct 11 22:17:57 UTC 2009 Modified Files: src/external/cddl/osnet/sys/sys: zfs_context.h Log Message: Define ptob only if it wasn't defined already in NetBSD headers. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/sys/zfs_context.h 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/zfs_context.h diff -u src/external/cddl/osnet/sys/sys/zfs_context.h:1.3 src/external/cddl/osnet/sys/sys/zfs_context.h:1.4 --- src/external/cddl/osnet/sys/sys/zfs_context.h:1.3 Sun Oct 11 10:56:13 2009 +++ src/external/cddl/osnet/sys/sys/zfs_context.h Sun Oct 11 22:17:57 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: zfs_context.h,v 1.3 2009/10/11 10:56:13 haad Exp $ */ +/* $NetBSD: zfs_context.h,v 1.4 2009/10/11 22:17:57 haad Exp $ */ /* * CDDL HEADER START @@ -499,8 +499,7 @@ #define ERESTART (-1) #endif -#ifdef ptob -#undef ptob +#ifndef ptob size_t ptob(size_t); #endif @@ -614,8 +613,7 @@ #define issig(x) (sigispending(curlwp, 0)) #define ISSIG(thr, why) (sigispending(thr, 0)) #define fm_panic panic -#ifdef ptob -#undef ptob +#ifndef ptob #define ptob(x) ((x) * PAGE_SIZE) #endif /* ptob */ #define strncat(a, b, c) strlcat(a, b, c)
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: haad Date: Sun Oct 11 10:56:13 UTC 2009 Modified Files: src/external/cddl/osnet/sys/sys: zfs_context.h Log Message: undef ptob if it was already defined/included in some NetBSD header file. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/sys/zfs_context.h 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/zfs_context.h diff -u src/external/cddl/osnet/sys/sys/zfs_context.h:1.2 src/external/cddl/osnet/sys/sys/zfs_context.h:1.3 --- src/external/cddl/osnet/sys/sys/zfs_context.h:1.2 Wed Oct 7 08:47:12 2009 +++ src/external/cddl/osnet/sys/sys/zfs_context.h Sun Oct 11 10:56:13 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: zfs_context.h,v 1.2 2009/10/07 08:47:12 haad Exp $ */ +/* $NetBSD: zfs_context.h,v 1.3 2009/10/11 10:56:13 haad Exp $ */ /* * CDDL HEADER START @@ -614,7 +614,10 @@ #define issig(x) (sigispending(curlwp, 0)) #define ISSIG(thr, why) (sigispending(thr, 0)) #define fm_panic panic +#ifdef ptob +#undef ptob #define ptob(x) ((x) * PAGE_SIZE) +#endif /* ptob */ #define strncat(a, b, c) strlcat(a, b, c) #define tsd_get(x) lwp_getspecific(x) #define tsd_set(x, y) (lwp_setspecific(x, y), 0)
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src Committed By: haad Date: Sun Oct 11 10:54:52 UTC 2009 Modified Files: src/external/cddl/osnet/sys/kern: vfs.c Log Message: Properly return error when namei_kernel_simple fails. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/kern/vfs.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/kern/vfs.c diff -u src/external/cddl/osnet/sys/kern/vfs.c:1.1 src/external/cddl/osnet/sys/kern/vfs.c:1.2 --- src/external/cddl/osnet/sys/kern/vfs.c:1.1 Fri Aug 7 20:57:57 2009 +++ src/external/cddl/osnet/sys/kern/vfs.c Sun Oct 11 10:54:52 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs.c,v 1.1 2009/08/07 20:57:57 haad Exp $ */ +/* $NetBSD: vfs.c,v 1.2 2009/10/11 10:54:52 haad Exp $ */ /*- * Copyright (c) 2006-2007 Pawel Jakub Dawidek @@ -51,7 +51,7 @@ KASSERT(dirvpp == NULL); - namei_simple_kernel(dirname, NSM_FOLLOW_NOEMULROOT, compvpp); + error = namei_simple_kernel(dirname, NSM_FOLLOW_NOEMULROOT, compvpp); return error; }
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: haad
Date: Wed Oct 7 08:47:12 UTC 2009
Modified Files:
src/external/cddl/osnet/sys/sys: zfs_context.h
Log Message:
Use ptob function from zfs and not NetBSD one.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/sys/zfs_context.h
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/zfs_context.h
diff -u src/external/cddl/osnet/sys/sys/zfs_context.h:1.1 src/external/cddl/osnet/sys/sys/zfs_context.h:1.2
--- src/external/cddl/osnet/sys/sys/zfs_context.h:1.1 Fri Aug 7 20:57:58 2009
+++ src/external/cddl/osnet/sys/sys/zfs_context.h Wed Oct 7 08:47:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: zfs_context.h,v 1.1 2009/08/07 20:57:58 haad Exp $ */
+/* $NetBSD: zfs_context.h,v 1.2 2009/10/07 08:47:12 haad Exp $ */
/*
* CDDL HEADER START
@@ -499,7 +499,10 @@
#define ERESTART (-1)
#endif
+#ifdef ptob
+#undef ptob
size_t ptob(size_t);
+#endif
typedef struct ksiddomain {
uint_t kd_ref;
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src Committed By: haad Date: Mon Aug 10 22:41:51 UTC 2009 Modified Files: src/external/cddl/osnet/sys/kern: ddi.c Log Message: Fix number of arguments passed to do_sys_mkdir. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/kern/ddi.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/kern/ddi.c diff -u src/external/cddl/osnet/sys/kern/ddi.c:1.1 src/external/cddl/osnet/sys/kern/ddi.c:1.2 --- src/external/cddl/osnet/sys/kern/ddi.c:1.1 Fri Aug 7 20:57:57 2009 +++ src/external/cddl/osnet/sys/kern/ddi.c Mon Aug 10 22:41:51 2009 @@ -105,7 +105,7 @@ break; strlcpy(here, path, e - path + 1); - error = do_sys_mkdir(l, (const char *)here, mode, &ret, UIO_SYSSPACE); + error = do_sys_mkdir((const char *)here, mode, UIO_SYSSPACE); } PNBUF_PUT(here);
