CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: yhardy
Date: Sat Nov 28 22:53:06 UTC 2020
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: vdev_disk.c
Log Message:
Use vn_close to release the vnodes in the error handling blocks, since
the vnodes were opened for writing. Fix proposed on current-users
and improved by hannken@.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.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/dist/uts/common/fs/zfs/vdev_disk.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.18 src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.19
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.18 Thu Jun 25 09:39:15 2020
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c Sat Nov 28 22:53:06 2020
@@ -215,7 +215,11 @@ vdev_disk_open(vdev_t *vd, uint64_t *psi
return (SET_ERROR(error));
}
if (vp->v_type != VBLK) {
+#ifdef __NetBSD__
+ vn_close(vp, FREAD|FWRITE, kcred);
+#else
vrele(vp);
+#endif
vd->vdev_stat.vs_aux = VDEV_AUX_OPEN_FAILED;
return (SET_ERROR(EINVAL));
}
@@ -247,7 +251,11 @@ vdev_disk_open(vdev_t *vd, uint64_t *psi
error = workqueue_create(>vd_wq, "vdevsync",
vdev_disk_flush, dvd, PRI_NONE, IPL_NONE, WQ_MPSAFE);
if (error != 0) {
+#ifdef __NetBSD__
+ vn_close(vp, FREAD|FWRITE, kcred);
+#else
vrele(vp);
+#endif
return (SET_ERROR(error));
}
CVS commit: src/sys/uvm
Module Name:src Committed By: yhardy Date: Fri Nov 27 22:32:43 UTC 2020 Modified Files: src/sys/uvm: uvm_mremap.c Log Message: uvm_mremap: reference the appropriate backing object. The previous approach was appropriate for anonymous memory and device objects, which continue to work in the same way. OK: chs@ Fixes: PR 55237 To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/uvm/uvm_mremap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/uvm/uvm_mremap.c diff -u src/sys/uvm/uvm_mremap.c:1.20 src/sys/uvm/uvm_mremap.c:1.21 --- src/sys/uvm/uvm_mremap.c:1.20 Sun Feb 23 15:46:43 2020 +++ src/sys/uvm/uvm_mremap.c Fri Nov 27 22:32:43 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_mremap.c,v 1.20 2020/02/23 15:46:43 ad Exp $ */ +/* $NetBSD: uvm_mremap.c,v 1.21 2020/11/27 22:32:43 yhardy Exp $ */ /*- * Copyright (c)2006,2007,2009 YAMAMOTO Takashi, @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uvm_mremap.c,v 1.20 2020/02/23 15:46:43 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvm_mremap.c,v 1.21 2020/11/27 22:32:43 yhardy Exp $"); #include #include @@ -80,10 +80,8 @@ uvm_mapent_extend(struct vm_map *map, va error = E2BIG; /* XXX */ goto done; } - rw_enter(uobj->vmobjlock, RW_WRITER); - KASSERT(uobj->uo_refs > 0); - atomic_inc_uint(>uo_refs); - rw_exit(uobj->vmobjlock); + if (uobj->pgops->pgo_reference) + uobj->pgops->pgo_reference(uobj); reserved_entry->object.uvm_obj = uobj; reserved_entry->offset = newoffset; }
CVS commit: src
Module Name:src
Committed By: yhardy
Date: Mon May 11 21:51:25 UTC 2020
Modified Files:
src/distrib/sets/lists/debug: md.amd64
src/distrib/sets/lists/tests: md.amd64
src/tests/lib/libi386: Makefile
Log Message:
Fix the build for MKCOMPAT=no.
The t_user_ldt test needs the i386 compat library which is only built
when MKCOMPAT=yes.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/tests/md.amd64
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libi386/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/debug/md.amd64
diff -u src/distrib/sets/lists/debug/md.amd64:1.108 src/distrib/sets/lists/debug/md.amd64:1.109
--- src/distrib/sets/lists/debug/md.amd64:1.108 Sun Apr 26 09:08:40 2020
+++ src/distrib/sets/lists/debug/md.amd64 Mon May 11 21:51:25 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.108 2020/04/26 09:08:40 maxv Exp $
+# $NetBSD: md.amd64,v 1.109 2020/05/11 21:51:25 yhardy Exp $
./usr/lib/i386/12.202++_g.a comp-c-debuglib debuglib,compat,12.202xx
./usr/lib/i386/libi386_g.a comp-c-debuglib debuglib,compat
./usr/lib/i386/libiberty_g.a comp-obsolete obsolete
@@ -25,7 +25,7 @@
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait6.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitid.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitpid.debug tests-obsolete obsolete
-./usr/libdata/debug/usr/tests/lib/libi386/t_user_ldt.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libi386/t_user_ldt.debug tests-lib-debug debug,atf,compat
./usr/libdata/debug/usr/tests/lib/libnvmm/h_io_assist.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libnvmm/h_mem_assist.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/modules/t_x86_pte.debug tests-sys-debug debug,atf
Index: src/distrib/sets/lists/tests/md.amd64
diff -u src/distrib/sets/lists/tests/md.amd64:1.10 src/distrib/sets/lists/tests/md.amd64:1.11
--- src/distrib/sets/lists/tests/md.amd64:1.10 Tue Apr 28 13:43:45 2020
+++ src/distrib/sets/lists/tests/md.amd64 Mon May 11 21:51:25 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.10 2020/04/28 13:43:45 rjs Exp $
+# $NetBSD: md.amd64,v 1.11 2020/05/11 21:51:25 yhardy Exp $
./usr/tests/kernel/arch/x86/Atffile tests-obsolete obsolete
./usr/tests/kernel/arch/x86/Kyuafile tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_wait tests-obsolete obsolete
@@ -7,7 +7,7 @@
./usr/tests/kernel/arch/x86/t_ptrace_wait6 tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_waitid tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_waitpid tests-obsolete obsolete
-./usr/tests/lib/libi386/t_user_ldt tests-lib-tests compattestfile,atf
+./usr/tests/lib/libi386/t_user_ldt tests-lib-tests compattestfile,atf,compat
./usr/tests/lib/libnvmm/h_io_assist tests-lib-tests compattestfile,atf
./usr/tests/lib/libnvmm/t_io_assist tests-lib-tests compattestfile,atf
./usr/tests/lib/libnvmm/h_mem_assist tests-lib-tests compattestfile,atf
Index: src/tests/lib/libi386/Makefile
diff -u src/tests/lib/libi386/Makefile:1.3 src/tests/lib/libi386/Makefile:1.4
--- src/tests/lib/libi386/Makefile:1.3 Mon Apr 20 12:08:08 2020
+++ src/tests/lib/libi386/Makefile Mon May 11 21:51:25 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2020/04/20 12:08:08 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/11 21:51:25 yhardy Exp $
.include
TESTSDIR= ${TESTSBASE}/lib/libi386
-.if ${MACHINE} == "amd64"
+.if ${MACHINE} == "amd64" && ${MKCOMPAT} == "yes"
SHLIBINSTALLDIR= /usr/lib/i386
COPTS+= -m32
LDFLAGS+= -m32
CVS commit: src/share/mk
Module Name:src Committed By: yhardy Date: Fri Oct 22 16:48:38 UTC 2010 Modified Files: src/share/mk: bsd.x11.mk Log Message: Fix pkg-config substitution for glu To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/share/mk/bsd.x11.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.x11.mk diff -u src/share/mk/bsd.x11.mk:1.89 src/share/mk/bsd.x11.mk:1.90 --- src/share/mk/bsd.x11.mk:1.89 Tue Aug 17 08:40:57 2010 +++ src/share/mk/bsd.x11.mk Fri Oct 22 16:48:38 2010 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.x11.mk,v 1.89 2010/08/17 08:40:57 christos Exp $ +# $NetBSD: bsd.x11.mk,v 1.90 2010/10/22 16:48:38 yhardy Exp $ .include bsd.init.mk @@ -310,7 +310,7 @@ s,@GL_PC_LIB_PRIV@,-lm -lpthread,; \ s,@GL_PC_CFLAGS@,,; \ s,@GLU_LIB@,GLU,; \ - s,@GLU_PC_REQ@,osmesa,; \ + s,@GLU_PC_REQ@,gl,; \ s,@GLU_PC_REQ_PRIV@,,; \ s,@GLU_PC_LIB_PRIV@,-lGLU,; \ s,@GLU_PC_CFLAGS@,,; \
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: yhardy
Date: Wed Apr 7 19:56:01 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
Log Message:
Don't link libOSMesa, this functionality is provided by mesa_dri.so.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/dri/i965/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.6 src/external/mit/xorg/lib/dri/i915/Makefile:1.7
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.6 Tue Jan 12 03:56:17 2010
+++ src/external/mit/xorg/lib/dri/i915/Makefile Wed Apr 7 19:56:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/01/12 03:56:17 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2010/04/07 19:56:01 yhardy Exp $
MODULE= i915
@@ -59,6 +59,5 @@
CPPFLAGS+= -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
-LIBDPLIBS+= OSMesa ${.CURDIR}/../../libOSMesa
.include ${.CURDIR}/../dri.mk
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.8 src/external/mit/xorg/lib/dri/i965/Makefile:1.9
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.8 Tue Jan 12 03:56:17 2010
+++ src/external/mit/xorg/lib/dri/i965/Makefile Wed Apr 7 19:56:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/01/12 03:56:17 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2010/04/07 19:56:01 yhardy Exp $
MODULE= i965
@@ -90,6 +90,5 @@
COPTS.brw_draw_upload.c= -Wno-error
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
-LIBDPLIBS+= OSMesa ${.CURDIR}/../../libOSMesa
.include ${.CURDIR}/../dri.mk
CVS commit: src/external/mit/xorg/lib/dri/libmesa
Module Name:src
Committed By: yhardy
Date: Wed Apr 7 20:04:16 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/libmesa: Makefile
Log Message:
i915 and i965 dri modules need glapi.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri/libmesa/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri/libmesa/Makefile
diff -u src/external/mit/xorg/lib/dri/libmesa/Makefile:1.4 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.5
--- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.4 Thu Oct 8 19:06:50 2009
+++ src/external/mit/xorg/lib/dri/libmesa/Makefile Wed Apr 7 20:04:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/10/08 19:06:50 snj Exp $
+# $NetBSD: Makefile,v 1.5 2010/04/07 20:04:16 yhardy Exp $
.include bsd.own.mk
@@ -7,7 +7,7 @@
SHLIB_MAJOR= 0
-MESA_SRC_MODULES= main math vbo tnl shader swrast slang ss
+MESA_SRC_MODULES= glapi main math vbo tnl shader swrast slang ss
CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/main \
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
