CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: tteras
Date: Wed Jun 24 11:28:48 UTC 2009
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: session.c
Log Message:
Fix a call to null pointer: in some cases, the unmonitor_fd can be called
from another fd's callback. That could lead to still have callback pending
after unmonitoring the fd resulting in a call to null pointer.
This is fixed by making unmonitor_fd now clear the pending fd_set too.
Bug was introduced by my commit in 2008-12-23.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/crypto/dist/ipsec-tools/src/racoon/session.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/session.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/session.c:1.25 src/crypto/dist/ipsec-tools/src/racoon/session.c:1.26
--- src/crypto/dist/ipsec-tools/src/racoon/session.c:1.25 Tue Apr 21 18:38:32 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/session.c Wed Jun 24 11:28:48 2009
@@ -1,11 +1,11 @@
-/* $NetBSD: session.c,v 1.25 2009/04/21 18:38:32 tteras Exp $ */
+/* $NetBSD: session.c,v 1.26 2009/06/24 11:28:48 tteras Exp $ */
/* $KAME: session.c,v 1.32 2003/09/24 02:01:17 jinmei Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -17,7 +17,7 @@
* 3. Neither the name of the project nor the names of its contributors
*may be used to endorse or promote products derived from this software
*without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT 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
@@ -113,7 +113,7 @@
static void check_flushsa __P((void));
static int close_sockets __P((void));
-static fd_set mask;
+static fd_set preset_mask, active_mask;
static struct fd_monitor fd_monitors[FD_SETSIZE];
static int nfds = 0;
@@ -128,7 +128,7 @@
exit(1);
}
- FD_SET(fd, mask);
+ FD_SET(fd, preset_mask);
if (fd nfds)
nfds = fd;
@@ -144,7 +144,8 @@
exit(1);
}
- FD_CLR(fd, mask);
+ FD_CLR(fd, preset_mask);
+ FD_CLR(fd, active_mask);
fd_monitors[fd].callback = NULL;
fd_monitors[fd].ctx = NULL;
}
@@ -152,7 +153,6 @@
int
session(void)
{
- fd_set rfds;
struct timeval *timeout;
int error;
char pid_file[MAXPATHLEN];
@@ -161,7 +161,7 @@
int i;
nfds = 0;
- FD_ZERO(mask);
+ FD_ZERO(preset_mask);
/* initialize schedular */
sched_init();
@@ -227,14 +227,14 @@
#endif
/* write .pid file */
- if (lcconf-pathinfo[LC_PATHTYPE_PIDFILE] == NULL)
+ if (lcconf-pathinfo[LC_PATHTYPE_PIDFILE] == NULL)
strlcpy(pid_file, _PATH_VARRUN racoon.pid, MAXPATHLEN);
- else if (lcconf-pathinfo[LC_PATHTYPE_PIDFILE][0] == '/')
+ else if (lcconf-pathinfo[LC_PATHTYPE_PIDFILE][0] == '/')
strlcpy(pid_file, lcconf-pathinfo[LC_PATHTYPE_PIDFILE], MAXPATHLEN);
else {
strlcat(pid_file, _PATH_VARRUN, MAXPATHLEN);
strlcat(pid_file, lcconf-pathinfo[LC_PATHTYPE_PIDFILE], MAXPATHLEN);
- }
+ }
fp = fopen(pid_file, w);
if (fp) {
if (fchmod(fileno(fp),
@@ -274,9 +274,9 @@
/* schedular can change select() mask, so we reset
* the working copy here */
- rfds = mask;
+ active_mask = preset_mask;
- error = select(nfds + 1, rfds, NULL, NULL, timeout);
+ error = select(nfds + 1, active_mask, NULL, NULL, timeout);
if (error 0) {
switch (errno) {
case EINTR:
@@ -291,8 +291,14 @@
}
for (i = 0; i = nfds; i++) {
- if (FD_ISSET(i, rfds))
+ if (!FD_ISSET(i, active_mask))
+continue;
+
+ if (fd_monitors[i].callback != NULL)
fd_monitors[i].callback(fd_monitors[i].ctx, i);
+ else
+plog(LLV_ERROR, LOCATION, NULL,
+ fd %d set, but no active callback\n, i);
}
}
}
@@ -342,7 +348,7 @@
#ifdef ENABLE_HYBRID
if ((isakmp_cfg_init(ISAKMP_CFG_INIT_WARM)) != 0) {
- plog(LLV_ERROR, LOCATION, NULL,
+ plog(LLV_ERROR, LOCATION, NULL,
ISAKMP mode config structure reset failed,
not reloading\n);
return;
@@ -373,7 +379,7 @@
}
restore_params();
-#if 0
+#if 0
if (dump_config)
dumprmconf ();
#endif
@@ -417,8 +423,8 @@
break;
#ifdef DEBUG_RECORD_MALLOCATION
- /*
- * XXX This operation is signal handler unsafe and may lead to
+ /*
+ * XXX This operation is signal handler unsafe and may lead to
* crashes and security breaches: See Henning Brauer talk at
* EuroBSDCon 2005. Do not run in production with this option
* enabled.
@@ -435,13 +441,13 @@
case SIGINT:
case SIGTERM:
- plog(LLV_INFO, LOCATION, NULL,
+ plog(LLV_INFO, LOCATION, NULL,
caught signal %d\n, sig);
close_session();
CVS commit: src/distrib/notes/common
Module Name:src Committed By: mbalmer Date: Wed Jun 24 12:15:44 UTC 2009 Modified Files: src/distrib/notes/common: main Log Message: Add myself as requested in the welcome mail. To generate a diff of this commit: cvs rdiff -u -r1.448 -r1.449 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.448 src/distrib/notes/common/main:1.449 --- src/distrib/notes/common/main:1.448 Wed May 27 09:40:01 2009 +++ src/distrib/notes/common/main Wed Jun 24 12:15:43 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.448 2009/05/27 09:40:01 njoly Exp $ +.\ $NetBSD: main,v 1.449 2009/06/24 12:15:43 mbalmer Exp $ .\ .\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1121,6 +1121,7 @@ .It Ta Lennart Augustsson Ta Mt augus...@netbsd.org .It Ta Zafer Aydogan Ta Mt za...@netbsd.org .It Ta Christoph Badura Ta Mt b...@netbsd.org +.It Ta Marc Balmer Ta Mt mbal...@netbsd.org .It Ta Bang Jun-Young Ta Mt junyo...@netbsd.org .It Ta Dieter Baron Ta Mt di...@netbsd.org .It Ta Robert V. Baron Ta Mt r...@netbsd.org
CVS commit: src/doc
Module Name:src Committed By: tron Date: Wed Jun 24 13:41:16 UTC 2009 Modified Files: src/doc: 3RDPARTY Log Message: Update developers responsible for Postfix. To generate a diff of this commit: cvs rdiff -u -r1.704 -r1.705 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.704 src/doc/3RDPARTY:1.705 --- src/doc/3RDPARTY:1.704 Tue Jun 23 18:00:11 2009 +++ src/doc/3RDPARTY Wed Jun 24 13:41:16 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.704 2009/06/23 18:00:11 tron Exp $ +# $NetBSD: 3RDPARTY,v 1.705 2009/06/24 13:41:16 tron Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -843,7 +843,7 @@ Archive Site: ftp://postfix.cloud9.net/official/ Home Page: http://www.postfix.org/ Mailing List: postfix-us...@postfix.org -Responsible: heas +Responsible: christos, tron License: IBM Public License. See also src/external/ibm-public/postfix/dist. Notes: HTML documentation should be kept in sync with the README_FILES.
CVS commit: [yamt-nfs-mp] src/sys/nfs
Module Name:src
Committed By: yamt
Date: Wed Jun 24 14:15:35 UTC 2009
Modified Files:
src/sys/nfs [yamt-nfs-mp]: nfs_vfsops.c
Log Message:
nfs_mount: re-enable MNT_UPDATE. it's broken as it is in trunk.
To generate a diff of this commit:
cvs rdiff -u -r1.196.10.3 -r1.196.10.4 src/sys/nfs/nfs_vfsops.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/nfs/nfs_vfsops.c
diff -u src/sys/nfs/nfs_vfsops.c:1.196.10.3 src/sys/nfs/nfs_vfsops.c:1.196.10.4
--- src/sys/nfs/nfs_vfsops.c:1.196.10.3 Mon May 4 08:14:22 2009
+++ src/sys/nfs/nfs_vfsops.c Wed Jun 24 14:15:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vfsops.c,v 1.196.10.3 2009/05/04 08:14:22 yamt Exp $ */
+/* $NetBSD: nfs_vfsops.c,v 1.196.10.4 2009/06/24 14:15:35 yamt Exp $ */
/*
* Copyright (c) 1989, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_vfsops.c,v 1.196.10.3 2009/05/04 08:14:22 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_vfsops.c,v 1.196.10.4 2009/06/24 14:15:35 yamt Exp $);
#if defined(_KERNEL_OPT)
#include opt_nfs.h
@@ -643,19 +643,17 @@
return (EPROGMISMATCH);
#endif
if (mp-mnt_flag MNT_UPDATE) {
-#if 0
if (nmp == NULL)
return (EIO);
/*
* When doing an update, we can't change from or to
* v3, or change cookie translation
*/
- args-flags = (args-flags ~(NFSMNT_NFSV3|NFSMNT_XLATECOOKIE)) |
+ args-flags =
+ (args-flags ~(NFSMNT_NFSV3|NFSMNT_XLATECOOKIE)) |
(nmp-nm_flag (NFSMNT_NFSV3|NFSMNT_XLATECOOKIE));
nfs_decode_args(nmp, args, l);
return (0);
-#endif
- return EOPNOTSUPP;
}
if (args-fhsize 0 || args-fhsize NFSX_V3FHMAX)
return (EINVAL);
CVS commit: [yamt-nfs-mp] src/sys
Module Name:src
Committed By: yamt
Date: Wed Jun 24 14:21:44 UTC 2009
Modified Files:
src/sys/kern [yamt-nfs-mp]: vfs_syscalls.c
src/sys/nfs [yamt-nfs-mp]: nfs_vfsops.c nfs_vnops.c
Log Message:
lock vnode when calling VOP_GETATTR because there's no reasonable way for
an implementation of VOP_GETATTR to prevent the vnode from being revoked.
To generate a diff of this commit:
cvs rdiff -u -r1.350.2.2 -r1.350.2.3 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.196.10.4 -r1.196.10.5 src/sys/nfs/nfs_vfsops.c
cvs rdiff -u -r1.266.10.3 -r1.266.10.4 src/sys/nfs/nfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.350.2.2 src/sys/kern/vfs_syscalls.c:1.350.2.3
--- src/sys/kern/vfs_syscalls.c:1.350.2.2 Mon May 4 08:13:49 2009
+++ src/sys/kern/vfs_syscalls.c Wed Jun 24 14:21:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.350.2.2 2009/05/04 08:13:49 yamt Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.350.2.3 2009/06/24 14:21:43 yamt Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_syscalls.c,v 1.350.2.2 2009/05/04 08:13:49 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_syscalls.c,v 1.350.2.3 2009/06/24 14:21:43 yamt Exp $);
#ifdef _KERNEL_OPT
#include opt_fileassoc.h
@@ -2185,7 +2185,9 @@
newoff = fp-f_offset + SCARG(uap, offset);
break;
case SEEK_END:
+ vn_lock(vp, LK_SHARED | LK_RETRY);
error = VOP_GETATTR(vp, vattr, cred);
+ VOP_UNLOCK(vp, 0);
if (error) {
goto out;
}
@@ -3586,7 +3588,10 @@
struct vattr vattr;
int error;
- if ((error = VOP_GETATTR(vp, vattr, cred)) != 0)
+ vn_lock(vp, LK_SHARED | LK_RETRY);
+ error = VOP_GETATTR(vp, vattr, cred);
+ VOP_UNLOCK(vp, 0);
+ if (error != 0)
return error;
if (kauth_cred_geteuid(cred) == vattr.va_uid ||
(error = kauth_authorize_generic(cred,
Index: src/sys/nfs/nfs_vfsops.c
diff -u src/sys/nfs/nfs_vfsops.c:1.196.10.4 src/sys/nfs/nfs_vfsops.c:1.196.10.5
--- src/sys/nfs/nfs_vfsops.c:1.196.10.4 Wed Jun 24 14:15:35 2009
+++ src/sys/nfs/nfs_vfsops.c Wed Jun 24 14:21:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vfsops.c,v 1.196.10.4 2009/06/24 14:15:35 yamt Exp $ */
+/* $NetBSD: nfs_vfsops.c,v 1.196.10.5 2009/06/24 14:21:43 yamt Exp $ */
/*
* Copyright (c) 1989, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_vfsops.c,v 1.196.10.4 2009/06/24 14:15:35 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_vfsops.c,v 1.196.10.5 2009/06/24 14:21:43 yamt Exp $);
#if defined(_KERNEL_OPT)
#include opt_nfs.h
@@ -386,9 +386,13 @@
vfs_unbusy(mp, false, NULL);
/* Get root attributes (for the time). */
+ error = vn_lock(vp, LK_EXCLUSIVE);
+ if (error)
+ panic(nfs_mountroot: lock for root);
error = VOP_GETATTR(vp, attr, l-l_cred);
if (error)
panic(nfs_mountroot: getattr for root);
+ VOP_UNLOCK(vp, 0);
n = attr.va_atime.tv_sec;
#ifdef DEBUG
printf(root time: 0x%lx\n, n);
Index: src/sys/nfs/nfs_vnops.c
diff -u src/sys/nfs/nfs_vnops.c:1.266.10.3 src/sys/nfs/nfs_vnops.c:1.266.10.4
--- src/sys/nfs/nfs_vnops.c:1.266.10.3 Sat May 16 10:41:51 2009
+++ src/sys/nfs/nfs_vnops.c Wed Jun 24 14:21:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vnops.c,v 1.266.10.3 2009/05/16 10:41:51 yamt Exp $ */
+/* $NetBSD: nfs_vnops.c,v 1.266.10.4 2009/06/24 14:21:43 yamt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_vnops.c,v 1.266.10.3 2009/05/16 10:41:51 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_vnops.c,v 1.266.10.4 2009/06/24 14:21:43 yamt Exp $);
#ifdef _KERNEL_OPT
#include opt_nfs.h
@@ -571,6 +571,8 @@
struct mbuf *mreq, *mrep, *md, *mb;
const int v3 = NFS_ISV3(vp);
+ KASSERT(VOP_ISLOCKED(vp));
+
/*
* Update local times for special files.
*/
CVS commit: src/share/man/man9
Module Name:src Committed By: dholland Date: Wed Jun 24 16:28:48 UTC 2009 Modified Files: src/share/man/man9: firmload.9 Log Message: Fix typo, noticed in passing by wiz To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man9/firmload.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/firmload.9 diff -u src/share/man/man9/firmload.9:1.4 src/share/man/man9/firmload.9:1.5 --- src/share/man/man9/firmload.9:1.4 Wed Apr 30 13:10:58 2008 +++ src/share/man/man9/firmload.9 Wed Jun 24 16:28:48 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: firmload.9,v 1.4 2008/04/30 13:10:58 martin Exp $ +.\ $NetBSD: firmload.9,v 1.5 2009/06/24 16:28:48 dholland Exp $ .\ .\ Copyright (c) 2006 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -61,7 +61,7 @@ images from files residing in the file system that are necessary for the devices that they control. Firmware images reside in sub-directories, one for each driver, of a series -of colon-separated path prefixes specified the sysctl variable +of colon-separated path prefixes specified by the sysctl variable .Dv hw.firmware.path . .Pp The following functions are provided by the
CVS commit: src/sys/fs/udf
Module Name:src
Committed By: reinoud
Date: Wed Jun 24 17:09:14 UTC 2009
Modified Files:
src/sys/fs/udf: udf.h udf_allocation.c udf_subr.c udf_subr.h
udf_vfsops.c udf_vnops.c
Log Message:
Commit first stage of free-space accounting. It is estimating the underlimit
of free blocks on the device and when free blocks are getting tight it tries
to readjust/recalculate that value by syncing the FS.
Second stage will be resizing the data/metadata partitions.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/fs/udf/udf.h
cvs rdiff -u -r1.25 -r1.26 src/sys/fs/udf/udf_allocation.c
cvs rdiff -u -r1.94 -r1.95 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.14 -r1.15 src/sys/fs/udf/udf_subr.h
cvs rdiff -u -r1.56 -r1.57 src/sys/fs/udf/udf_vfsops.c
cvs rdiff -u -r1.45 -r1.46 src/sys/fs/udf/udf_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/udf/udf.h
diff -u src/sys/fs/udf/udf.h:1.33 src/sys/fs/udf/udf.h:1.34
--- src/sys/fs/udf/udf.h:1.33 Tue Jun 23 20:13:37 2009
+++ src/sys/fs/udf/udf.h Wed Jun 24 17:09:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.h,v 1.33 2009/06/23 20:13:37 reinoud Exp $ */
+/* $NetBSD: udf.h,v 1.34 2009/06/24 17:09:13 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -124,6 +124,7 @@
#define UDF_VAT_CHUNKSIZE (64*1024) /* picked */
#define UDF_SYMLINKBUFLEN (64*1024) /* picked */
+#define UDF_DISC_SLACK (128) /* picked, at least 64 kb or 128 */
#define UDF_ISO_VRS_SIZE (32*2048) /* 32 ISO `sectors' */
@@ -340,7 +341,7 @@
kcondvar_t dirtynodes_cv; /* sleeping on sync */
/* late allocation */
- uint32_t uncomitted_lb; /* for free space*/
+ int32_t uncommitted_lbs[UDF_PARTITIONS];
struct long_ad *la_node_ad_cpy; /* issue buf */
uint64_t *la_lmapping, *la_pmapping; /* issue buf */
@@ -387,6 +388,7 @@
struct lockf *lockf; /* lock list */
uint32_t outstanding_bufs; /* file data */
uint32_t outstanding_nodedscr; /* node dscr */
+ int32_t uncommitted_lbs; /* in UBC*/
/* references to associated nodes */
struct udf_node *extattr;
Index: src/sys/fs/udf/udf_allocation.c
diff -u src/sys/fs/udf/udf_allocation.c:1.25 src/sys/fs/udf/udf_allocation.c:1.26
--- src/sys/fs/udf/udf_allocation.c:1.25 Thu Jun 18 15:09:18 2009
+++ src/sys/fs/udf/udf_allocation.c Wed Jun 24 17:09:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_allocation.c,v 1.25 2009/06/18 15:09:18 reinoud Exp $ */
+/* $NetBSD: udf_allocation.c,v 1.26 2009/06/24 17:09:13 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_allocation.c,v 1.25 2009/06/18 15:09:18 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_allocation.c,v 1.26 2009/06/24 17:09:13 reinoud Exp $);
#endif /* not lint */
@@ -367,6 +367,93 @@
/* - */
+void
+udf_calc_freespace(struct udf_mount *ump, uint64_t *sizeblks, uint64_t *freeblks)
+{
+ struct logvol_int_desc *lvid;
+ uint32_t *pos1, *pos2;
+ int vpart, num_vpart;
+
+ lvid = ump-logvol_integrity;
+ *freeblks = *sizeblks = 0;
+
+ /*
+ * Sequentials media report free space directly (CD/DVD/BD-R), for the
+ * other media we need the logical volume integrity.
+ *
+ * We sum all free space up here regardless of type.
+ */
+
+ KASSERT(lvid);
+ num_vpart = udf_rw32(lvid-num_part);
+
+ if (ump-discinfo.mmc_cur MMC_CAP_SEQUENTIAL) {
+ /* use track info directly summing if there are 2 open */
+ /* XXX assumption at most two tracks open */
+ *freeblks = ump-data_track.free_blocks;
+ if (ump-data_track.tracknr != ump-metadata_track.tracknr)
+ *freeblks += ump-metadata_track.free_blocks;
+ *sizeblks = ump-discinfo.last_possible_lba;
+ } else {
+ /* free and used space for mountpoint based on logvol integrity */
+ for (vpart = 0; vpart num_vpart; vpart++) {
+ pos1 = lvid-tables[0] + vpart;
+ pos2 = lvid-tables[0] + num_vpart + vpart;
+ if (udf_rw32(*pos1) != (uint32_t) -1) {
+*freeblks += udf_rw32(*pos1);
+*sizeblks += udf_rw32(*pos2);
+ }
+ }
+ }
+ /* adjust for accounted uncommitted blocks */
+ for (vpart = 0; vpart num_vpart; vpart++)
+ *freeblks -= ump-uncommitted_lbs[vpart];
+
+ if (*freeblks UDF_DISC_SLACK) {
+ *freeblks -= UDF_DISC_SLACK;
+ } else {
+ *freeblks = 0;
+ }
+}
+
+
+static void
+udf_calc_vpart_freespace(struct udf_mount *ump, uint16_t vpart_num, uint64_t *freeblks)
+{
+ struct logvol_int_desc *lvid;
+ uint32_t *pos1;
+
+ lvid = ump-logvol_integrity;
+ *freeblks = 0;
+
+ /*
+ * Sequentials media report free space directly (CD/DVD/BD-R), for the
+ * other media we need the logical volume integrity.
+ *
+ * We sum all free space up here regardless of type.
+ */
+
+ KASSERT(lvid);
+ if (ump-discinfo.mmc_cur MMC_CAP_SEQUENTIAL) {
+ /* XXX
CVS commit: [netbsd-5] src/sys/external/bsd/drm/dist
Module Name:src
Committed By: snj
Date: Wed Jun 24 17:51:32 UTC 2009
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core [netbsd-5]: mach64_drv.c
mga_drv.c r128_drv.c savage_drv.c sis_drv.c tdfx_drv.c
src/sys/external/bsd/drm/dist/shared-core [netbsd-5]: mach64_dma.c
mach64_drv.h savage_bci.c savage_state.c sis_ds.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #830):
sys/external/bsd/drm/dist/bsd-core/mach64_drv.c: revision 1.4
sys/external/bsd/drm/dist/bsd-core/mga_drv.c: revision 1.5
sys/external/bsd/drm/dist/bsd-core/r128_drv.c: revision 1.4
sys/external/bsd/drm/dist/bsd-core/savage_drv.c: revision 1.4
sys/external/bsd/drm/dist/bsd-core/sis_drv.c: revision 1.4
sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c: revision 1.4
sys/external/bsd/drm/dist/shared-core/mach64_dma.c: revision 1.2
sys/external/bsd/drm/dist/shared-core/mach64_drv.h: revision 1.4
sys/external/bsd/drm/dist/shared-core/savage_bci.c: revision 1.4
sys/external/bsd/drm/dist/shared-core/savage_state.c: revision 1.4
sys/external/bsd/drm/dist/shared-core/sis_ds.c: revision 1.4
add a bunch of fixes mostly from ra...@.
this fixes the build for all the other drm modules.
use pci_find_device() to kill the one XXX rafal left.
To generate a diff of this commit:
cvs rdiff -u -r1.2.10.1 -r1.2.10.2 \
src/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c \
src/sys/external/bsd/drm/dist/bsd-core/r128_drv.c \
src/sys/external/bsd/drm/dist/bsd-core/savage_drv.c \
src/sys/external/bsd/drm/dist/bsd-core/sis_drv.c \
src/sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c
cvs rdiff -u -r1.3.10.1 -r1.3.10.2 \
src/sys/external/bsd/drm/dist/bsd-core/mga_drv.c
cvs rdiff -u -r1.1.1.1.10.1 -r1.1.1.1.10.2 \
src/sys/external/bsd/drm/dist/shared-core/mach64_dma.c
cvs rdiff -u -r1.2.10.1 -r1.2.10.2 \
src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h \
src/sys/external/bsd/drm/dist/shared-core/savage_bci.c \
src/sys/external/bsd/drm/dist/shared-core/savage_state.c \
src/sys/external/bsd/drm/dist/shared-core/sis_ds.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/external/bsd/drm/dist/bsd-core/mach64_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c:1.2.10.1 src/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c:1.2.10.2
--- src/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c:1.2.10.1 Sat Jun 20 23:36:59 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c Wed Jun 24 17:51:31 2009
@@ -44,6 +44,12 @@
mach64_PCI_IDS
};
+int
+mach64_driver_load(struct drm_device * dev, unsigned long flags)
+{
+return drm_vblank_init(dev, 1);
+}
+
static void mach64_configure(struct drm_device *dev)
{
dev-driver-driver_features =
@@ -73,6 +79,8 @@
dev-driver-patchlevel = DRIVER_PATCHLEVEL;
}
+#if defined(__FreeBSD__)
+
static int
mach64_probe(device_t kdev)
{
@@ -92,12 +100,6 @@
return drm_attach(kdev, mach64_pciidlist);
}
-int
-mach64_driver_load(struct drm_device * dev, unsigned long flags)
-{
-return drm_vblank_init(dev, 1);
-}
-
static int
mach64_detach(device_t kdev)
{
@@ -133,3 +135,90 @@
DRIVER_MODULE(mach64, pci, mach64_driver, drm_devclass, 0, 0);
#endif
MODULE_DEPEND(mach64, drm, 1, 1, 1);
+
+#elif defined(__NetBSD__)
+
+static int
+mach64drm_probe(device_t parent, cfdata_t match, void *aux)
+{
+ struct pci_attach_args *pa = aux;
+
+ return drm_probe(pa, mach64_pciidlist);
+}
+
+static void
+mach64drm_attach(device_t parent, device_t self, void *aux)
+{
+ struct pci_attach_args *pa = aux;
+ struct drm_device *dev = device_private(self);
+
+ dev-driver = malloc(sizeof(struct drm_driver_info), DRM_MEM_DRIVER,
+ M_WAITOK | M_ZERO);
+
+ mach64_configure(dev);
+
+ drm_attach(self, pa, mach64_pciidlist);
+}
+
+CFATTACH_DECL_NEW(mach64drm, sizeof(struct drm_device),
+mach64drm_probe, mach64drm_attach, drm_detach, drm_activate);
+
+#ifdef _MODULE
+
+MODULE(MODULE_CLASS_DRIVER, mach64drm, NULL);
+
+CFDRIVER_DECL(mach64drm, DV_DULL, NULL);
+extern struct cfattach mach64drm_ca;
+static int drmloc[] = { -1 };
+static struct cfparent drmparent = {
+ drm, vga, DVUNIT_ANY
+};
+static struct cfdata mach64drm_cfdata[] = {
+ {
+ .cf_name = mach64drm,
+ .cf_atname = mach64drm,
+ .cf_unit = 0,
+ .cf_fstate = FSTATE_STAR,
+ .cf_loc = drmloc,
+ .cf_flags = 0,
+ .cf_pspec = drmparent,
+ },
+ { NULL }
+};
+
+static int
+mach64drm_modcmd(modcmd_t cmd, void *arg)
+{
+ int err;
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ err = config_cfdriver_attach(mach64drm_cd);
+ if (err)
+ return err;
+ err = config_cfattach_attach(mach64drm, mach64drm_ca);
+ if (err) {
+ config_cfdriver_detach(mach64drm_cd);
+ return err;
+ }
+ err = config_cfdata_attach(mach64drm_cfdata, 1);
+ if (err) {
+
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Wed Jun 24 17:53:11 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 830. To generate a diff of this commit: cvs rdiff -u -r1.1.2.36 -r1.1.2.37 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.36 src/doc/CHANGES-5.1:1.1.2.37 --- src/doc/CHANGES-5.1:1.1.2.36 Tue Jun 23 07:12:21 2009 +++ src/doc/CHANGES-5.1 Wed Jun 24 17:53:11 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.36 2009/06/23 07:12:21 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.37 2009/06/24 17:53:11 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -1321,3 +1321,19 @@ Fix modules build after update of drm(4). [mrg, ticket #829] +sys/external/bsd/drm/dist/bsd-core/mach64_drv.c 1.4 +sys/external/bsd/drm/dist/bsd-core/mga_drv.c 1.5 +sys/external/bsd/drm/dist/bsd-core/r128_drv.c 1.4 +sys/external/bsd/drm/dist/bsd-core/savage_drv.c 1.4 +sys/external/bsd/drm/dist/bsd-core/sis_drv.c 1.4 +sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c 1.4 +sys/external/bsd/drm/dist/shared-core/mach64_dma.c 1.2 +sys/external/bsd/drm/dist/shared-core/mach64_drv.h 1.4 +sys/external/bsd/drm/dist/shared-core/savage_bci.c 1.4 +sys/external/bsd/drm/dist/shared-core/savage_state.c 1.4 +sys/external/bsd/drm/dist/shared-core/sis_ds.c 1.4 + + Add a bunch of fixes mostly from ra...@. Use pci_find_device() + to kill the one XXX rafal left. + [mrg, ticket #830] +
CVS commit: src/lib/libc/sys
Module Name:src Committed By: zafer Date: Wed Jun 24 22:19:14 UTC 2009 Modified Files: src/lib/libc/sys: _lwp_kill.2 Log Message: fix spelling error. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/sys/_lwp_kill.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/_lwp_kill.2 diff -u src/lib/libc/sys/_lwp_kill.2:1.3 src/lib/libc/sys/_lwp_kill.2:1.4 --- src/lib/libc/sys/_lwp_kill.2:1.3 Wed Apr 30 13:10:51 2008 +++ src/lib/libc/sys/_lwp_kill.2 Wed Jun 24 22:19:14 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: _lwp_kill.2,v 1.3 2008/04/30 13:10:51 martin Exp $ +.\ $NetBSD: _lwp_kill.2,v 1.4 2009/06/24 22:19:14 zafer Exp $ .\ .\ Copyright (c) 2003, 2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -49,7 +49,7 @@ .Fa sig argument is given as 0 (zero), .Nm -will test for the existance of the target LWP, but will take no further +will test for the existence of the target LWP, but will take no further action. .Pp Job control signals and uncatchable signals can not be directed to a specific
CVS commit: src/lib/libutil
Module Name:src Committed By: zafer Date: Wed Jun 24 22:31:58 UTC 2009 Modified Files: src/lib/libutil: getlabelsector.3 Log Message: correct spelling error. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libutil/getlabelsector.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libutil/getlabelsector.3 diff -u src/lib/libutil/getlabelsector.3:1.4 src/lib/libutil/getlabelsector.3:1.5 --- src/lib/libutil/getlabelsector.3:1.4 Wed Apr 16 13:35:14 2003 +++ src/lib/libutil/getlabelsector.3 Wed Jun 24 22:31:58 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: getlabelsector.3,v 1.4 2003/04/16 13:35:14 wiz Exp $ +.\ $NetBSD: getlabelsector.3,v 1.5 2009/06/24 22:31:58 zafer Exp $ .\ .\ .\ Copyright 2002 Wasabi Systems, Inc. @@ -57,7 +57,7 @@ functions return values which describe the exact on-disk location of the .Xr disklabel 5 on the current system, or \-1 on error. -These functions supercede the hardcoded +These functions supersede the hardcoded .Dv LABELSECTOR and .Dv LABELOFFSET
CVS commit: src/share/man/man9
Module Name:src Committed By: zafer Date: Wed Jun 24 22:39:41 UTC 2009 Modified Files: src/share/man/man9: fstrans.9 Log Message: fix common spelling error. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man9/fstrans.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/fstrans.9 diff -u src/share/man/man9/fstrans.9:1.13 src/share/man/man9/fstrans.9:1.14 --- src/share/man/man9/fstrans.9:1.13 Sun Apr 12 19:00:56 2009 +++ src/share/man/man9/fstrans.9 Wed Jun 24 22:39:40 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: fstrans.9,v 1.13 2009/04/12 19:00:56 joerg Exp $ +.\ $NetBSD: fstrans.9,v 1.14 2009/06/24 22:39:40 zafer Exp $ .\ .\ Copyright (c) 2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -126,8 +126,8 @@ .Fa mp . .It Fn fstrans_start_nowait mp lock_type will not wait for a state change of the file system when attempting to -aquire the lock. -The thread may still sleep while attempting to aquire the lock. +acquire the lock. +The thread may still sleep while attempting to acquire the lock. .It Fn fstrans_done mp releases a lock on the file system .Fa mp .
CVS commit: src/share/man/man4
Module Name:src Committed By: zafer Date: Wed Jun 24 23:10:02 UTC 2009 Modified Files: src/share/man/man4: options.4 Log Message: catch spelling error. To generate a diff of this commit: cvs rdiff -u -r1.379 -r1.380 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/options.4 diff -u src/share/man/man4/options.4:1.379 src/share/man/man4/options.4:1.380 --- src/share/man/man4/options.4:1.379 Mon May 4 20:09:10 2009 +++ src/share/man/man4/options.4 Wed Jun 24 23:10:02 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: options.4,v 1.379 2009/05/04 20:09:10 wiz Exp $ +.\ $NetBSD: options.4,v 1.380 2009/06/24 23:10:02 zafer Exp $ .\ .\ Copyright (c) 1996 .\ Perry E. Metzger. All rights reserved. @@ -1504,7 +1504,7 @@ It can also lock up the entire i2c bus and even prevent a machine from completing the boot process. Don't use this option unless you know what you're doing and can -accept all sorts of unforseen consequences. +accept all sorts of unforeseen consequences. .El .Ss Networking Options .Bl -ohang
CVS commit: xsrc/external/mit/xf86-video-newport/dist/src
Module Name:xsrc
Committed By: macallan
Date: Thu Jun 25 00:59:58 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-newport/dist/src: newport_driver.c
Log Message:
make this compile with new Xorg
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c
diff -u xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.3 xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.4
--- xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.3 Mon Feb 16 20:57:43 2009
+++ xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c Thu Jun 25 00:59:57 2009
@@ -286,7 +286,7 @@
+ busID * NEWPORT_BASE_OFFSET);
RANGE(range[0], base, base + sizeof(NewportRegs),\
ResExcMemBlock);
- pScrn = xf86ConfigIsaEntity(pScrn, 0, entity, NULL, range, \
+ pScrn = (void *)xf86ConfigIsaEntity(pScrn, 0, entity, NULL, range, \
NULL, NULL, NULL, NULL);
/* Allocate a ScrnInfoRec */
pScrn-driverVersion = NEWPORT_VERSION;
@@ -831,6 +831,8 @@
for (i = 0; i 256; i++) {
col.red = col.green = col.blue = i;
NewportCmapSetRGB(NEWPORTREGSPTR(pScrn), i, col);
+ NewportCmapSetRGB(NEWPORTREGSPTR(pScrn), i + 256, col);
+ NewportCmapSetRGB(NEWPORTREGSPTR(pScrn), i + 512, col);
}
}
/* blank the framebuffer */
CVS commit: [netbsd-5] src/sys/external/bsd/drm/dist/bsd-core
Module Name:src Committed By: snj Date: Thu Jun 25 01:41:31 UTC 2009 Modified Files: src/sys/external/bsd/drm/dist/bsd-core [netbsd-5]: mga_drv.c Log Message: Pull up following revision(s) (requested by mrg in ticket #832): sys/external/bsd/drm/dist/bsd-core/mga_drv.c: revision 1.6 don't include pcidevs_data.h. To generate a diff of this commit: cvs rdiff -u -r1.3.10.2 -r1.3.10.3 \ src/sys/external/bsd/drm/dist/bsd-core/mga_drv.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/external/bsd/drm/dist/bsd-core/mga_drv.c diff -u src/sys/external/bsd/drm/dist/bsd-core/mga_drv.c:1.3.10.2 src/sys/external/bsd/drm/dist/bsd-core/mga_drv.c:1.3.10.3 --- src/sys/external/bsd/drm/dist/bsd-core/mga_drv.c:1.3.10.2 Wed Jun 24 17:51:31 2009 +++ src/sys/external/bsd/drm/dist/bsd-core/mga_drv.c Thu Jun 25 01:41:31 2009 @@ -40,7 +40,6 @@ #ifdef __NetBSD__ #include dev/pci/pcivar.h #include dev/pci/pcidevs.h -#include dev/pci/pcidevs_data.h #endif /* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Thu Jun 25 01:42:21 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 832. To generate a diff of this commit: cvs rdiff -u -r1.1.2.37 -r1.1.2.38 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.37 src/doc/CHANGES-5.1:1.1.2.38 --- src/doc/CHANGES-5.1:1.1.2.37 Wed Jun 24 17:53:11 2009 +++ src/doc/CHANGES-5.1 Thu Jun 25 01:42:21 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.37 2009/06/24 17:53:11 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.38 2009/06/25 01:42:21 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -1337,3 +1337,8 @@ to kill the one XXX rafal left. [mrg, ticket #830] +sys/external/bsd/drm/dist/bsd-core/mga_drv.c 1.6 + + Don't include pcidevs_data.h. Fixes build of mga_drv. + [mrg, ticket #832] +
CVS commit: [netbsd-5] src/share/man/man4
Module Name:src Committed By: snj Date: Thu Jun 25 01:54:12 UTC 2009 Modified Files: src/share/man/man4 [netbsd-5]: drm.4 Log Message: Apply patch (requested by mrg in ticket #828): Fix a typo. To generate a diff of this commit: cvs rdiff -u -r1.4.18.1 -r1.4.18.2 src/share/man/man4/drm.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/drm.4 diff -u src/share/man/man4/drm.4:1.4.18.1 src/share/man/man4/drm.4:1.4.18.2 --- src/share/man/man4/drm.4:1.4.18.1 Tue Jun 23 07:04:53 2009 +++ src/share/man/man4/drm.4 Thu Jun 25 01:54:12 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: drm.4,v 1.4.18.1 2009/06/23 07:04:53 snj Exp $ +.\ $NetBSD: drm.4,v 1.4.18.2 2009/06/25 01:54:12 snj Exp $ .\ .\ Copyright (c) 2007 Thomas Klausner .\ All rights reserved. @@ -215,4 +215,4 @@ .Pa src/sys/dev/drm/files.drm and .Pa src/sys/dev/pci/drm/files.pcidrm -require minor edits, noted at the bottle of these files. +require minor edits, noted at the bottom of these files.
