Re: CVS commit: src
I see that this commit removed blocks that should have stayed. For example, in rbootd.8: -.\from: @(#)rbootd.8 8.2 (Berkeley) 12/11/93 -.\ -.\ Utah Hdr: rbootd.man 3.1 92/07/06 -.\ Author: Jeff Forys, University of Utah CSS -.\ Perhaps it only affects man pages, but please check and restore them. Thanks, Thomas
Re: CVS commit: src/lib/librumphijack
On Wed, Feb 09, 2011 at 02:30:38AM +, Christos Zoulas wrote:
To get the layering correct, we could make the fortification code define
another prototype and use double rename, e.g.
ssize_t __real_read(int __fd, ...) __RENAME(read);
__ssp_inline ssize_t read(int __fd, ...) __RENAME(__ssp_read);
__sso_inline ssize_t read(int __fd, ...) {
__ssp_check(__buf, __lean, bos);
return __real_read(__fd, ...);
}
Yes, that would work. An extra level of indirection always works.
It isn't really. It is just tricking the compiler into creating the
right external symbols. The result is that using SSP doesn't change
which symbols end up being called.
Joerg
Re: CVS commit: src/lib/librumphijack
On Wed Feb 09 2011 at 02:32:17 +, Christos Zoulas wrote: And, on a tangent, it would really help if we had some mechanism for latest version of symbol exported by libc (cf. mess with select, pollts, kevent and socket). For working compat, I guess we'd need to bump rumphijack major every time one of them changes, but I can't think of a good mechanism for an application to automatically select the major that needs to be used. That would be useful. Oh, and one other related thing on my wishlist is having libc export all syscall stubs in WEAKASM _sys style so that use-fd-to-select-kernel can work on static linked binaries which cannot use RTLD_NEXT. I guess another option would be to compile local syscall stubs, but it seems easier to have them popping out of libc. -- älä karot toivorikkauttas, kyl rätei ja lumpui piisaa
Re: CVS commit: src/lib/librumphijack
On Wed, Feb 09, 2011 at 14:06:08 +0200, Antti Kantee wrote: On Wed Feb 09 2011 at 02:32:17 +, Christos Zoulas wrote: And, on a tangent, it would really help if we had some mechanism for latest version of symbol exported by libc (cf. mess with select, pollts, kevent and socket). For working compat, I guess we'd need to bump rumphijack major every time one of them changes, but I can't think of a good mechanism for an application to automatically select the major that needs to be used. That would be useful. Oh, and one other related thing on my wishlist is having libc export all syscall stubs in WEAKASM _sys style so that use-fd-to-select-kernel can work on static linked binaries which cannot use RTLD_NEXT. I guess another option would be to compile local syscall stubs, but it seems easier to have them popping out of libc. Is source-changes-d really the right place for this discussion? -uwe
Re: CVS commit: src/lib/librumpclient
On Wed, Feb 09, 2011 at 02:29:58PM +, Antti Kantee wrote: Hence, prevent rumpclient from using the special fd's 0-2 for its purposes. Probably worth dup'ing onto quite high numbers (if possible). Well, above 20 anyway. David -- David Laight: da...@l8s.co.uk
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: haad Date: Wed Feb 9 08:11:38 UTC 2011 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.sparc64 Log Message: Fix libdm breakage on 64bit platforms. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/base/md.sparc64 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/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.39 src/distrib/sets/lists/base/ad.mips64eb:1.40 --- src/distrib/sets/lists/base/ad.mips64eb:1.39 Sun Feb 6 00:44:08 2011 +++ src/distrib/sets/lists/base/ad.mips64eb Wed Feb 9 08:11:37 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.39 2011/02/06 00:44:08 christos Exp $ +# $NetBSD: ad.mips64eb,v 1.40 2011/02/09 08:11:37 haad Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -77,6 +77,9 @@ ./usr/lib/64/libcurses.so.7.0 base-compat-shlib compat,pic ./usr/lib/64/libdes.so.8 base-compat-shlib compat,pic,crypto ./usr/lib/64/libdes.so.8.1 base-compat-shlib compat,pic,crypto +./usr/lib/64/libdm.sobase-compat-shlib compat,pic +./usr/lib/64/libdm.so.0base-compat-shlib compat,pic +./usr/lib/64/libdm.so.0.0 base-compat-shlib compat,pic ./usr/lib/64/libdns.so.5 base-compat-shlib compat,pic ./usr/lib/64/libdns.so.5.2 base-compat-shlib compat,pic ./usr/lib/64/libdns_sd.so.0 base-compat-shlib compat,pic,mdns @@ -336,6 +339,9 @@ ./usr/lib/o32/libcurses.so.7.0 base-compat-shlib compat,pic ./usr/lib/o32/libdes.so.8 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libdes.so.8.1 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libdm.sobase-compat-shlib compat,pic +./usr/lib/o32/libdm.so.0 base-compat-shlib compat,pic +./usr/lib/o32/libdm.so.0.0 base-compat-shlib compat,pic ./usr/lib/o32/libdns.so.5 base-compat-shlib compat,pic ./usr/lib/o32/libdns.so.5.2 base-compat-shlib compat,pic ./usr/lib/o32/libdns_sd.so.0 base-compat-shlib compat,pic,mdns Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.37 src/distrib/sets/lists/base/ad.mips64el:1.38 --- src/distrib/sets/lists/base/ad.mips64el:1.37 Sun Feb 6 00:44:08 2011 +++ src/distrib/sets/lists/base/ad.mips64el Wed Feb 9 08:11:37 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.37 2011/02/06 00:44:08 christos Exp $ +# $NetBSD: ad.mips64el,v 1.38 2011/02/09 08:11:37 haad Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -77,6 +77,9 @@ ./usr/lib/64/libcurses.so.7.0 base-compat-shlib compat,pic ./usr/lib/64/libdes.so.8 base-compat-shlib compat,pic,crypto ./usr/lib/64/libdes.so.8.1 base-compat-shlib compat,pic,crypto +./usr/lib/64/libdm.sobase-compat-shlib compat,pic +./usr/lib/64/libdm.so.0base-compat-shlib compat,pic +./usr/lib/64/libdm.so.0.0 base-compat-shlib compat,pic ./usr/lib/64/libdns.so.5 base-compat-shlib compat,pic ./usr/lib/64/libdns.so.5.2 base-compat-shlib compat,pic ./usr/lib/64/libdns_sd.so.0 base-compat-shlib compat,pic,mdns @@ -336,6 +339,9 @@ ./usr/lib/o32/libcurses.so.7.0 base-compat-shlib compat,pic ./usr/lib/o32/libdes.so.8 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libdes.so.8.1 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libdm.sobase-compat-shlib compat,pic +./usr/lib/o32/libdm.so.0 base-compat-shlib compat,pic +./usr/lib/o32/libdm.so.0.0 base-compat-shlib compat,pic ./usr/lib/o32/libdns.so.5 base-compat-shlib compat,pic ./usr/lib/o32/libdns.so.5.2 base-compat-shlib compat,pic ./usr/lib/o32/libdns_sd.so.0 base-compat-shlib compat,pic,mdns Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.105 src/distrib/sets/lists/base/md.sparc64:1.106 --- src/distrib/sets/lists/base/md.sparc64:1.105 Sun Feb 6 00:44:08 2011 +++ src/distrib/sets/lists/base/md.sparc64 Wed Feb 9 08:11:37 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.105 2011/02/06 00:44:08 christos Exp $ +# $NetBSD: md.sparc64,v 1.106 2011/02/09 08:11:37 haad Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root obsolete ./usr/bin/fdformatbase-util-bin @@ -78,6 +78,9 @@ ./usr/lib/sparc/libcurses.so.7.0 base-compat-shlib compat,pic ./usr/lib/sparc/libdes.so.8 base-compat-shlib compat,pic,crypto ./usr/lib/sparc/libdes.so.8.1 base-compat-shlib compat,pic,crypto +./usr/lib/sparc/libdm.so base-compat-shlib compat,pic +./usr/lib/sparc/libdm.so.0 base-compat-shlib compat,pic +./usr/lib/sparc/libdm.so.0.0 base-compat-shlib compat,pic
CVS commit: src/sys/arch/hp300/hp300
Module Name:src Committed By: tsutsui Date: Wed Feb 9 09:29:57 UTC 2011 Modified Files: src/sys/arch/hp300/hp300: autoconf.c Log Message: Remove leftover debug stuff. To generate a diff of this commit: cvs rdiff -u -r1.94 -r1.95 src/sys/arch/hp300/hp300/autoconf.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/arch/hp300/hp300/autoconf.c diff -u src/sys/arch/hp300/hp300/autoconf.c:1.94 src/sys/arch/hp300/hp300/autoconf.c:1.95 --- src/sys/arch/hp300/hp300/autoconf.c:1.94 Tue Feb 8 20:20:13 2011 +++ src/sys/arch/hp300/hp300/autoconf.c Wed Feb 9 09:29:57 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.94 2011/02/08 20:20:13 rmind Exp $ */ +/* $NetBSD: autoconf.c,v 1.95 2011/02/09 09:29:57 tsutsui Exp $ */ /*- * Copyright (c) 1996, 1997, 2002 The NetBSD Foundation, Inc. @@ -88,7 +88,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.94 2011/02/08 20:20:13 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.95 2011/02/09 09:29:57 tsutsui Exp $); #include dvbox.h #include gbox.h @@ -764,7 +764,7 @@ #endif #if NCOM_DIO 0 if (!dio_scan(com_dio_cnattach)) - ;//return; + return; #endif #if NDCM 0 if (!dio_scan(dcmcnattach))
CVS commit: src/sys/arch/hp300/hp300
Module Name:src
Committed By: tsutsui
Date: Wed Feb 9 09:32:50 UTC 2011
Modified Files:
src/sys/arch/hp300/hp300: autoconf.c machdep.c
Log Message:
NHIL is no more.
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/hp300/hp300/autoconf.c
cvs rdiff -u -r1.217 -r1.218 src/sys/arch/hp300/hp300/machdep.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/arch/hp300/hp300/autoconf.c
diff -u src/sys/arch/hp300/hp300/autoconf.c:1.95 src/sys/arch/hp300/hp300/autoconf.c:1.96
--- src/sys/arch/hp300/hp300/autoconf.c:1.95 Wed Feb 9 09:29:57 2011
+++ src/sys/arch/hp300/hp300/autoconf.c Wed Feb 9 09:32:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.95 2011/02/09 09:29:57 tsutsui Exp $ */
+/* $NetBSD: autoconf.c,v 1.96 2011/02/09 09:32:49 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 2002 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.95 2011/02/09 09:29:57 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.96 2011/02/09 09:32:49 tsutsui Exp $);
#include dvbox.h
#include gbox.h
@@ -827,7 +827,8 @@
dnkbdcnattach(bst, FRODO_BASE + FRODO_APCI_OFFSET(0))
#endif
-#if NHIL 0
+#if NHILKBD 0
+ /* not yet */
hilkbdcnattach(bst, HIL_BASE);
#endif
;
Index: src/sys/arch/hp300/hp300/machdep.c
diff -u src/sys/arch/hp300/hp300/machdep.c:1.217 src/sys/arch/hp300/hp300/machdep.c:1.218
--- src/sys/arch/hp300/hp300/machdep.c:1.217 Tue Feb 8 20:20:13 2011
+++ src/sys/arch/hp300/hp300/machdep.c Wed Feb 9 09:32:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.217 2011/02/08 20:20:13 rmind Exp $ */
+/* $NetBSD: machdep.c,v 1.218 2011/02/09 09:32:49 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.217 2011/02/08 20:20:13 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.218 2011/02/09 09:32:49 tsutsui Exp $);
#include opt_ddb.h
#include opt_compat_netbsd.h
@@ -1022,7 +1022,8 @@
static int innmihand; /* simple mutex */
/*
- * Level 7 interrupts can be caused by the keyboard or parity errors.
+ * Level 7 interrupts can be caused by HIL keyboards (in cooked mode only,
+ * but we run them in raw mode) or parity errors.
*/
void
nmihand(struct frame frame)
@@ -1033,57 +1034,12 @@
return;
innmihand = 1;
-#if NHIL 0
- /* Check for keyboard CRTL+SHIFT+RESET. */
- if (kbdnmi()) {
- printf(Got a keyboard NMI);
-
- /*
- * We can:
- *
- * - enter DDB
- *
- * - Start the crashandburn sequence
- *
- * - Ignore it.
- */
-#ifdef DDB
- printf(: entering debugger\n);
- Debugger();
-#else
-#ifdef PANICBUTTON
- if (panicbutton) {
- /* XXX */
- callout_init(candbtimer_ch, 0);
- if (crashandburn) {
-crashandburn = 0;
-printf(: CRASH AND BURN!\n);
-panic(forced crash);
- } else {
-/* Start the crashandburn sequence */
-printf(\n);
-crashandburn = 1;
-callout_reset(candbtimer_ch, hz / candbdiv,
-candbtimer, NULL);
- }
- } else
-#endif /* PANICBUTTON */
- printf(: ignoring\n);
-#endif /* DDB */
-
- goto nmihand_out; /* no more work to do */
- }
-#endif
-
if (parityerror(frame))
return;
/* panic?? */
printf(unexpected level 7 interrupt ignored\n);
-#if NHIL 0
-nmihand_out:
innmihand = 0;
-#endif
}
/*
CVS commit: src/lib/libc/resolv
Module Name:src
Committed By: pooka
Date: Wed Feb 9 09:46:59 UTC 2011
Modified Files:
src/lib/libc/resolv: res_send.c
Log Message:
Don't do highestFD check with USE_POLL. It provides no benefit
but causes a dependency between RLIMIT_NOFILE and rumphijack FDOFF.
christos ok
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/resolv/res_send.c
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/resolv/res_send.c
diff -u src/lib/libc/resolv/res_send.c:1.20 src/lib/libc/resolv/res_send.c:1.21
--- src/lib/libc/resolv/res_send.c:1.20 Sat Oct 24 17:24:01 2009
+++ src/lib/libc/resolv/res_send.c Wed Feb 9 09:46:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: res_send.c,v 1.20 2009/10/24 17:24:01 christos Exp $ */
+/* $NetBSD: res_send.c,v 1.21 2011/02/09 09:46:59 pooka Exp $ */
/*
* Portions Copyright (C) 2004-2009 Internet Systems Consortium, Inc. (ISC)
@@ -93,7 +93,7 @@
static const char sccsid[] = @(#)res_send.c 8.1 (Berkeley) 6/4/93;
static const char rcsid[] = Id: res_send.c,v 1.22 2009/01/22 23:49:23 tbox Exp;
#else
-__RCSID($NetBSD: res_send.c,v 1.20 2009/10/24 17:24:01 christos Exp $);
+__RCSID($NetBSD: res_send.c,v 1.21 2011/02/09 09:46:59 pooka Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -157,8 +157,6 @@
#ifndef USE_POLL
static const int highestFD = FD_SETSIZE - 1;
-#else
-static int highestFD = 0;
#endif
/* Forward. */
@@ -333,10 +331,6 @@
int gotsomewhere, terrno, tries, v_circuit, resplen, ns, n;
char abuf[NI_MAXHOST];
-#ifdef USE_POLL
- highestFD = sysconf(_SC_OPEN_MAX) - 1;
-#endif
-
(void)res_check(statp, NULL);
/* No name servers or res_init() failure */
@@ -669,10 +663,12 @@
res_nclose(statp);
statp-_vcsock = socket(nsap-sa_family, SOCK_STREAM, 0);
+#ifndef USE_POLL
if (statp-_vcsock highestFD) {
res_nclose(statp);
errno = ENOTSOCK;
}
+#endif
if (statp-_vcsock 0) {
switch (errno) {
case EPROTONOSUPPORT:
@@ -848,10 +844,12 @@
nsaplen = get_salen(nsap);
if (EXT(statp).nssocks[ns] == -1) {
EXT(statp).nssocks[ns] = socket(nsap-sa_family, SOCK_DGRAM, 0);
+#ifndef USE_POLL
if (EXT(statp).nssocks[ns] highestFD) {
res_nclose(statp);
errno = ENOTSOCK;
}
+#endif
if (EXT(statp).nssocks[ns] 0) {
switch (errno) {
case EPROTONOSUPPORT:
CVS commit: [bouyer-quota2] src/usr.sbin/quotacheck
Module Name:src
Committed By: bouyer
Date: Wed Feb 9 09:51:17 UTC 2011
Modified Files:
src/usr.sbin/quotacheck [bouyer-quota2]: quotacheck.c
Log Message:
Make it build in new world.
Don't attempt to update in-kernel quota, but instead warn if quotas
are already on. The rc.d script runs quotacheck before quotaon
so this shouldn't be a problem.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.14.1 src/usr.sbin/quotacheck/quotacheck.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/quotacheck/quotacheck.c
diff -u src/usr.sbin/quotacheck/quotacheck.c:1.40 src/usr.sbin/quotacheck/quotacheck.c:1.40.14.1
--- src/usr.sbin/quotacheck/quotacheck.c:1.40 Thu Oct 9 14:56:35 2008
+++ src/usr.sbin/quotacheck/quotacheck.c Wed Feb 9 09:51:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: quotacheck.c,v 1.40 2008/10/09 14:56:35 christos Exp $ */
+/* $NetBSD: quotacheck.c,v 1.40.14.1 2011/02/09 09:51:17 bouyer Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)quotacheck.c 8.6 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: quotacheck.c,v 1.40 2008/10/09 14:56:35 christos Exp $);
+__RCSID($NetBSD: quotacheck.c,v 1.40.14.1 2011/02/09 09:51:17 bouyer Exp $);
#endif
#endif /* not lint */
@@ -52,9 +52,10 @@
#include sys/param.h
#include sys/stat.h
#include sys/queue.h
+#include sys/statvfs.h
#include ufs/ufs/dinode.h
-#include ufs/ufs/quota.h
+#include ufs/ufs/quota1.h
#include ufs/ufs/ufs_bswap.h
#include ufs/ffs/fs.h
#include ufs/ffs/ffs_extern.h
@@ -482,9 +483,25 @@
u_int32_t id, lastid, nextid;
int need_seek;
struct dqblk dqbuf;
- static int warned = 0;
static struct dqblk zerodqbuf;
static struct fileusage zerofileusage;
+ struct statvfs *fst;
+ int nfst, i;
+
+ nfst = getmntinfo(fst, MNT_WAIT);
+ if (nfst == 0)
+ errx(1, no filesystems mounted!);
+
+ for (i = 0; i nfst; i++) {
+ if (strncmp(fst[i].f_fstypename, ffs,
+ sizeof(fst[i].f_fstypename)) == 0
+ strncmp(fst[i].f_mntonname, fsname,
+ sizeof(fst[i].f_mntonname)) == 0
+ (fst[i].f_flag ST_QUOTA) != 0) {
+ warnx(filesystem %s has quotas already turned on,
+ fsname);
+ }
+ }
if ((qfo = fopen(quotafile, r+)) == NULL) {
if (errno == ENOENT)
@@ -507,12 +524,6 @@
(void) fclose(qfo);
return (1);
}
- if (quotactl(fsname, QCMD(Q_SYNC, type), 0, (void *) NULL) 0
- errno == EOPNOTSUPP !warned vflag) {
- warned++;
- (void)printf(*** Warning: %s\n,
- Quotas are not compiled into this kernel);
- }
need_seek = 1;
for (lastid = highid[type], id = 0; id = lastid; id = nextid) {
if (fread((char *)dqbuf, sizeof(struct dqblk), 1, qfi) == 0)
@@ -577,10 +588,6 @@
}
(void) fwrite((char *)dqbuf, sizeof(struct dqblk), 1, qfo);
- if (!warned)
- (void) quotactl(fsname, QCMD(Q_SETUSE, type), id,
- (caddr_t)dqbuf);
-
fup-fu_curinodes = 0;
fup-fu_curblocks = 0;
if (id == UINT32_MAX || nextid == 0) { /* infinite loop avoidance (OR do as nextid id?) */
CVS commit: [bouyer-quota2] src/usr.sbin/quotaon
Module Name:src
Committed By: bouyer
Date: Wed Feb 9 10:21:02 UTC 2011
Modified Files:
src/usr.sbin/quotaon [bouyer-quota2]: Makefile quotaon.c
Log Message:
Make it compile with new quotactl
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.64.1 src/usr.sbin/quotaon/Makefile
cvs rdiff -u -r1.23 -r1.23.2.1 src/usr.sbin/quotaon/quotaon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/quotaon/Makefile
diff -u src/usr.sbin/quotaon/Makefile:1.5 src/usr.sbin/quotaon/Makefile:1.5.64.1
--- src/usr.sbin/quotaon/Makefile:1.5 Sat Oct 18 04:37:55 1997
+++ src/usr.sbin/quotaon/Makefile Wed Feb 9 10:21:02 2011
@@ -1,9 +1,18 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $NetBSD: Makefile,v 1.5 1997/10/18 04:37:55 lukem Exp $
+# $NetBSD: Makefile,v 1.5.64.1 2011/02/09 10:21:02 bouyer Exp $
+.include bsd.own.mk
PROG= quotaon
+SRCS= quotaon.c
MAN= quotaon.8
MLINKS= quotaon.8 quotaoff.8
LINKS= ${BINDIR}/quotaon ${BINDIR}/quotaoff
+CPPFLAGS+=-I${NETBSDSRCDIR}/sys
+DPADD= ${LIBPROP}
+LDADD= -lprop
+
+.PATH: ${NETBSDSRCDIR}/sys/ufs/ufs
+SRCS+= quota2_prop.c
+
.include bsd.prog.mk
Index: src/usr.sbin/quotaon/quotaon.c
diff -u src/usr.sbin/quotaon/quotaon.c:1.23 src/usr.sbin/quotaon/quotaon.c:1.23.2.1
--- src/usr.sbin/quotaon/quotaon.c:1.23 Sat Apr 18 08:20:41 2009
+++ src/usr.sbin/quotaon/quotaon.c Wed Feb 9 10:21:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: quotaon.c,v 1.23 2009/04/18 08:20:41 lukem Exp $ */
+/* $NetBSD: quotaon.c,v 1.23.2.1 2011/02/09 10:21:02 bouyer Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)quotaon.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: quotaon.c,v 1.23 2009/04/18 08:20:41 lukem Exp $);
+__RCSID($NetBSD: quotaon.c,v 1.23.2.1 2011/02/09 10:21:02 bouyer Exp $);
#endif
#endif /* not lint */
@@ -52,7 +52,11 @@
#include sys/param.h
#include sys/file.h
#include sys/mount.h
-#include ufs/ufs/quota.h
+
+#include ufs/ufs/quota2_prop.h
+#include ufs/ufs/quota1.h
+#include sys/quota.h
+
#include err.h
#include fstab.h
@@ -168,27 +172,78 @@
int offmode, type;
char *qfpathname;
{
+ const char *mode = (offmode == 1) ? off : on;
+ prop_dictionary_t dict, data, cmd;
+ prop_array_t cmds, datas;
+ struct plistref pref;
+ int error;
+ int8_t error8;
+
+ dict = quota2_prop_create();
+ cmds = prop_array_create();
+ datas = prop_array_create();
if (strcmp(fs-fs_file, /) readonly(fs))
return (1);
+
+ if (dict == NULL || cmds == NULL || datas == NULL)
+ errx(1, can't allocate proplist);
+
if (offmode) {
- if (quotactl(fs-fs_file, QCMD(Q_QUOTAOFF, type), 0, 0) 0) {
- warn(%s, fs-fs_file);
- return (1);
- }
- if (vflag)
- printf(%s: %s quotas turned off\n,
- fs-fs_file, qfextension[type]);
- return (0);
+ if (!quota2_prop_add_command(cmds, quotaoff,
+ qfextension[type], datas))
+ err(1, prop_add_command);
+ } else {
+ data = prop_dictionary_create();
+ if (data == NULL)
+ errx(1, can't allocate proplist);
+ if (!prop_dictionary_set_cstring(data, quotafile,
+ qfpathname))
+ err(1, prop_dictionary_set(quotafile));
+ if (!prop_array_add_and_rel(datas, data))
+ err(1, prop_array_add(data));
+ if (!quota2_prop_add_command(cmds, quotaon,
+ qfextension[type], datas))
+ err(1, prop_add_command);
}
- if (quotactl(fs-fs_file, QCMD(Q_QUOTAON, type), 0, qfpathname) 0) {
- warn(%s quotas using %s on %s,
- qfextension[type], qfpathname, fs-fs_file);
- return (1);
+ if (!prop_dictionary_set(dict, commands, cmds))
+ err(1, prop_dictionary_set(command));
+
+ if (!prop_dictionary_send_syscall(dict, pref))
+ err(1, prop_dictionary_send_syscall);
+ prop_object_release(dict);
+
+ if (quotactl(fs-fs_file, pref) != 0) {
+ warn(quotactl(%s), fs-fs_file);
+ return(1);
+ }
+
+ if ((error = prop_dictionary_recv_syscall(pref, dict)) != 0) {
+ errx(1, prop_dictionary_recv_syscall: %s\n,
+ strerror(error));
+ }
+
+ if ((error = quota2_get_cmds(dict, cmds)) != 0) {
+ errx(1, quota2_get_cmds: %s\n, strerror(error));
+ }
+ /* only one command, no need to iter */
+ cmd = prop_array_get(cmds, 0);
+ if (cmd == NULL)
+ err(1, prop_array_get(cmd));
+
+ if (!prop_dictionary_get_int8(cmd, return, error8))
+ err(1, prop_get(return));
+
+ if (error8) {
+ warnx(quota%s for %s: %s, mode, fs-fs_file,
+ strerror(error8));
+ return 1;
+ }
+
+ if (vflag) {
+ printf(%s: %s quotas turned %s\n,
+ fs-fs_file, qfextension[type], mode);
}
- if (vflag)
- printf(%s: %s quotas turned on\n, fs-fs_file,
- qfextension[type]);
return (0);
}
CVS commit: [bouyer-quota2] src/usr.bin/quota
Module Name:src Committed By: bouyer Date: Wed Feb 9 10:21:36 UTC 2011 Modified Files: src/usr.bin/quota [bouyer-quota2]: getvfsquota.c Log Message: Use prop_array_add_and_rel() To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/usr.bin/quota/getvfsquota.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/quota/getvfsquota.c diff -u src/usr.bin/quota/getvfsquota.c:1.1.2.2 src/usr.bin/quota/getvfsquota.c:1.1.2.3 --- src/usr.bin/quota/getvfsquota.c:1.1.2.2 Sun Jan 30 19:38:45 2011 +++ src/usr.bin/quota/getvfsquota.c Wed Feb 9 10:21:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: getvfsquota.c,v 1.1.2.2 2011/01/30 19:38:45 bouyer Exp $ */ +/* $NetBSD: getvfsquota.c,v 1.1.2.3 2011/02/09 10:21:36 bouyer Exp $ */ /*- * Copyright (c) 2011 Manuel Bouyer @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: getvfsquota.c,v 1.1.2.2 2011/01/30 19:38:45 bouyer Exp $); +__RCSID($NetBSD: getvfsquota.c,v 1.1.2.3 2011/02/09 10:21:36 bouyer Exp $); #include stdio.h #include stdlib.h @@ -75,9 +75,8 @@ if (!ret) err(1, prop_dictionary_set(id)); - if (!prop_array_add(datas, data)) + if (!prop_array_add_and_rel(datas, data)) err(1, prop_array_add(data)); - prop_object_release(data); if (!quota2_prop_add_command(cmds, get, qfextension[type], datas)) err(1, prop_add_command); if (!quota2_prop_add_command(cmds, get version, qfextension[type],
CVS commit: src/usr.sbin
Module Name:src Committed By: rmind Date: Wed Feb 9 10:25:41 UTC 2011 Modified Files: src/usr.sbin/rbootd: rbootd.8 src/usr.sbin/vnconfig: vnconfig.8 Log Message: Restore historic SCCS IDs in the comments (were removed in previous commit). Noted by wiz@. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/rbootd/rbootd.8 cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/vnconfig/vnconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/rbootd/rbootd.8 diff -u src/usr.sbin/rbootd/rbootd.8:1.10 src/usr.sbin/rbootd/rbootd.8:1.11 --- src/usr.sbin/rbootd/rbootd.8:1.10 Tue Feb 8 20:20:28 2011 +++ src/usr.sbin/rbootd/rbootd.8 Wed Feb 9 10:25:40 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: rbootd.8,v 1.10 2011/02/08 20:20:28 rmind Exp $ +.\ $NetBSD: rbootd.8,v 1.11 2011/02/09 10:25:40 rmind Exp $ .\ .\ Copyright (c) 1988, 1992 The University of Utah and the Center .\ for Software Science (CSS). @@ -35,6 +35,11 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ +.\ from: @(#)rbootd.8 8.2 (Berkeley) 12/11/93 +.\ +.\ Utah Hdr: rbootd.man 3.1 92/07/06 +.\ Author: Jeff Forys, University of Utah CSS +.\ .Dd December 11, 1993 .Dt RBOOTD 8 .Os Index: src/usr.sbin/vnconfig/vnconfig.8 diff -u src/usr.sbin/vnconfig/vnconfig.8:1.35 src/usr.sbin/vnconfig/vnconfig.8:1.36 --- src/usr.sbin/vnconfig/vnconfig.8:1.35 Tue Feb 8 20:20:28 2011 +++ src/usr.sbin/vnconfig/vnconfig.8 Wed Feb 9 10:25:40 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: vnconfig.8,v 1.35 2011/02/08 20:20:28 rmind Exp $ +.\ $NetBSD: vnconfig.8,v 1.36 2011/02/09 10:25:40 rmind Exp $ .\ .\ Copyright (c) 1997 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -59,6 +59,8 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ +.\ @(#)vnconfig.8 8.1 (Berkeley) 6/5/93 +.\ .Dd July 16, 2005 .Dt VNCONFIG 8 .Os
CVS commit: [bouyer-quota2] src
Module Name:src Committed By: bouyer Date: Wed Feb 9 10:51:03 UTC 2011 Modified Files: src/distrib/sets/lists/tests [bouyer-quota2]: mi src/etc/mtree [bouyer-quota2]: NetBSD.dist.tests Log Message: Add quota tests To generate a diff of this commit: cvs rdiff -u -r1.240.2.1 -r1.240.2.2 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.23.2.2 -r1.23.2.3 src/etc/mtree/NetBSD.dist.tests 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.240.2.1 src/distrib/sets/lists/tests/mi:1.240.2.2 --- src/distrib/sets/lists/tests/mi:1.240.2.1 Tue Feb 8 16:18:39 2011 +++ src/distrib/sets/lists/tests/mi Wed Feb 9 10:51:03 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.240.2.1 2011/02/08 16:18:39 bouyer Exp $ +# $NetBSD: mi,v 1.240.2.2 2011/02/09 10:51:03 bouyer Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1171,12 +1171,23 @@ ./usr/tests/fs/h_funcs.subr tests-fs-tests atf ./usr/tests/fs/ffstests-fs-tests ./usr/tests/fs/ffs/Atffile tests-fs-tests atf +./usr/tests/fs/ffs/h_quota2_server tests-fs-tests atf +./usr/tests/fs/ffs/h_quota2_tests tests-fs-tests atf +./usr/tests/fs/ffs/rump_edquota tests-fs-tests atf +./usr/tests/fs/ffs/rump_quota tests-fs-tests atf +./usr/tests/fs/ffs/rump_quotactl tests-fs-tests atf +./usr/tests/fs/ffs/rump_repquota tests-fs-tests atf ./usr/tests/fs/ffs/t_fifos tests-fs-tests atf ./usr/tests/fs/ffs/t_mount tests-fs-tests atf ./usr/tests/fs/ffs/t_renamerace tests-obsolete obsolete ./usr/tests/fs/ffs/t_snapshot tests-fs-tests atf -./usr/tests/fs/ffs/t_snapshot_log tests-fs-tests atf -./usr/tests/fs/ffs/t_snapshot_v2 tests-fs-tests atf +./usr/tests/fs/ffs/t_snapshot_log tests-fs-tests atf +./usr/tests/fs/ffs/t_snapshot_v2 tests-fs-tests atf +./usr/tests/fs/ffs/t_clearquota tests-fs-tests atf +./usr/tests/fs/ffs/t_getquota tests-fs-tests atf +./usr/tests/fs/ffs/t_quota2_1 tests-fs-tests atf +./usr/tests/fs/ffs/t_quotalimit tests-fs-tests atf +./usr/tests/fs/ffs/t_setquota tests-fs-tests atf ./usr/tests/fs/kernfstests-fs-tests ./usr/tests/fs/kernfs/Atffile tests-fs-tests atf ./usr/tests/fs/kernfs/t_basic tests-fs-tests atf @@ -1981,6 +1992,13 @@ ./usr/tests/rump/rumpvfs/t_p2kifs tests-rump-tests atf ./usr/tests/sbintests-sbin-tests ./usr/tests/sbin/Atffile tests-sbin-tests atf +./usr/tests/sbin/fsck_ffs tests-sbin-tests +./usr/tests/sbin/fsck_ffs/Atffile tests-sbin-tests atf +./usr/tests/sbin/fsck_ffs/t_check_quotas tests-sbin-tests atf +./usr/tests/sbin/fsck_ffs/t_enable_quotas tests-sbin-tests atf +./usr/tests/sbin/newfstests-sbin-tests +./usr/tests/sbin/newfs/Atffile tests-sbin-tests atf +./usr/tests/sbin/newfs/t_enable_quotas tests-sbin-tests atf ./usr/tests/sbin/resize_ffs tests-sbin-tests ./usr/tests/sbin/resize_ffs/Atffile tests-sbin-tests atf ./usr/tests/sbin/resize_ffs/t_grow tests-sbin-tests atf Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.23.2.2 src/etc/mtree/NetBSD.dist.tests:1.23.2.3 --- src/etc/mtree/NetBSD.dist.tests:1.23.2.2 Tue Feb 8 16:18:50 2011 +++ src/etc/mtree/NetBSD.dist.tests Wed Feb 9 10:51:03 2011 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.23.2.2 2011/02/08 16:18:50 bouyer Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.23.2.3 2011/02/09 10:51:03 bouyer Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -210,6 +210,7 @@ ./usr/tests/rump/rumpvfs ./usr/tests/sbin ./usr/tests/sbin/fsck_ffs +./usr/tests/sbin/newfs ./usr/tests/sbin/resize_ffs ./usr/tests/sys ./usr/tests/sys/rc
CVS commit: [bouyer-quota2] src/distrib/sets/lists/base
Module Name:src Committed By: bouyer Date: Wed Feb 9 10:55:13 UTC 2011 Modified Files: src/distrib/sets/lists/base [bouyer-quota2]: shl.mi Log Message: Sync with HEAD To generate a diff of this commit: cvs rdiff -u -r1.569.2.1 -r1.569.2.2 src/distrib/sets/lists/base/shl.mi 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/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.569.2.1 src/distrib/sets/lists/base/shl.mi:1.569.2.2 --- src/distrib/sets/lists/base/shl.mi:1.569.2.1 Tue Feb 8 16:18:36 2011 +++ src/distrib/sets/lists/base/shl.mi Wed Feb 9 10:55:13 2011 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.569.2.1 2011/02/08 16:18:36 bouyer Exp $ +# $NetBSD: shl.mi,v 1.569.2.2 2011/02/09 10:55:13 bouyer Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -25,9 +25,6 @@ ./lib/libdevmapper.sobase-lvm-shlib lvm,dynamicroot ./lib/libdevmapper.so.1base-lvm-shlib lvm,dynamicroot ./lib/libdevmapper.so.1.0 base-lvm-shlib lvm,dynamicroot -./lib/libdm.so base-sys-shlib dynamicroot -./lib/libdm.so.0base-sys-shlib dynamicroot -./lib/libdm.so.0.0base-sys-shlib dynamicroot ./lib/libedit.sobase-sys-shlib dynamicroot ./lib/libedit.so.3base-sys-shlib dynamicroot ./lib/libedit.so.3.0base-sys-shlib dynamicroot
CVS commit: [bouyer-quota2] src/sys/arch/x86
Module Name:src Committed By: bouyer Date: Wed Feb 9 11:00:08 UTC 2011 Modified Files: src/sys/arch/x86/include [bouyer-quota2]: genfb_machdep.h src/sys/arch/x86/x86 [bouyer-quota2]: genfb_machdep.c Log Message: Sync with HEAD To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.14.1 src/sys/arch/x86/include/genfb_machdep.h cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/sys/arch/x86/x86/genfb_machdep.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/arch/x86/include/genfb_machdep.h diff -u src/sys/arch/x86/include/genfb_machdep.h:1.1 src/sys/arch/x86/include/genfb_machdep.h:1.1.14.1 --- src/sys/arch/x86/include/genfb_machdep.h:1.1 Tue Feb 17 01:42:52 2009 +++ src/sys/arch/x86/include/genfb_machdep.h Wed Feb 9 11:00:07 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: genfb_machdep.h,v 1.1 2009/02/17 01:42:52 jmcneill Exp $ */ +/* $NetBSD: genfb_machdep.h,v 1.1.14.1 2011/02/09 11:00:07 bouyer Exp $ */ /*- * Copyright (c) 2009 Jared D. McNeill jmcne...@invisible.ca @@ -30,5 +30,6 @@ #define _X86_GENFB_MACHDEP_H int x86_genfb_cnattach(void); +void x86_genfb_mtrr_init(uint64_t, uint32_t); #endif /* !_X86_GENFB_MACHDEP_H */ Index: src/sys/arch/x86/x86/genfb_machdep.c diff -u src/sys/arch/x86/x86/genfb_machdep.c:1.4.4.1 src/sys/arch/x86/x86/genfb_machdep.c:1.4.4.2 --- src/sys/arch/x86/x86/genfb_machdep.c:1.4.4.1 Tue Feb 8 16:19:45 2011 +++ src/sys/arch/x86/x86/genfb_machdep.c Wed Feb 9 11:00:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: genfb_machdep.c,v 1.4.4.1 2011/02/08 16:19:45 bouyer Exp $ */ +/* $NetBSD: genfb_machdep.c,v 1.4.4.2 2011/02/09 11:00:08 bouyer Exp $ */ /*- * Copyright (c) 2009 Jared D. McNeill jmcne...@invisible.ca @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: genfb_machdep.c,v 1.4.4.1 2011/02/08 16:19:45 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: genfb_machdep.c,v 1.4.4.2 2011/02/09 11:00:08 bouyer Exp $); #include opt_mtrr.h @@ -92,7 +92,7 @@ mtrr.flags = MTRR_VALID; mtrr.owner = 0; - aprint_debug(%s: 0x%llx-0x%llx\n, __func__, + aprint_debug(%s: 0x% PRIx64 -0x% PRIx64 \n, __func__, mtrr.base, mtrr.base + mtrr.len - 1); n = 1;
CVS commit: [bouyer-quota2] src/sys/ufs
Module Name:src
Committed By: bouyer
Date: Wed Feb 9 11:18:30 UTC 2011
Modified Files:
src/sys/ufs [bouyer-quota2]: files.ufs
src/sys/ufs/lfs [bouyer-quota2]: lfs_vfsops.c
src/sys/ufs/ufs [bouyer-quota2]: quota.h quota1.h ufs_quota.c
ufs_quota.h ufs_quota2.c
Log Message:
Various build fixes
To generate a diff of this commit:
cvs rdiff -u -r1.24.6.1 -r1.24.6.2 src/sys/ufs/files.ufs
cvs rdiff -u -r1.287 -r1.287.4.1 src/sys/ufs/lfs/lfs_vfsops.c
cvs rdiff -u -r1.25.64.2 -r1.25.64.3 src/sys/ufs/ufs/quota.h
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/ufs/ufs/quota1.h
cvs rdiff -u -r1.68.4.9 -r1.68.4.10 src/sys/ufs/ufs/ufs_quota.c
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/ufs/ufs/ufs_quota.h
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/ufs/ufs/ufs_quota2.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/ufs/files.ufs
diff -u src/sys/ufs/files.ufs:1.24.6.1 src/sys/ufs/files.ufs:1.24.6.2
--- src/sys/ufs/files.ufs:1.24.6.1 Thu Jan 20 14:25:01 2011
+++ src/sys/ufs/files.ufs Wed Feb 9 11:18:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.ufs,v 1.24.6.1 2011/01/20 14:25:01 bouyer Exp $
+# $NetBSD: files.ufs,v 1.24.6.2 2011/02/09 11:18:29 bouyer Exp $
deffs FFS
deffs EXT2FS
@@ -63,6 +63,7 @@
file ufs/ufs/ufs_quota1.c quota (ffs | lfs | mfs | ext2fs)
file ufs/ufs/ufs_quota2.c quota2 (ffs | lfs | mfs | ext2fs)
file ufs/ufs/quota2_subr.c quota2 (ffs | lfs | mfs | ext2fs)
+file ufs/ufs/quota2_prop.c (quota | quota2) (ffs | lfs | mfs | ext2fs)
file ufs/ufs/ufs_vfsops.c ffs | lfs | mfs | ext2fs
file ufs/ufs/ufs_vnops.c ffs | lfs | mfs | ext2fs
file ufs/ufs/ufs_wapbl.c ffs wapbl
Index: src/sys/ufs/lfs/lfs_vfsops.c
diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.287 src/sys/ufs/lfs/lfs_vfsops.c:1.287.4.1
--- src/sys/ufs/lfs/lfs_vfsops.c:1.287 Thu Jun 24 13:03:19 2010
+++ src/sys/ufs/lfs/lfs_vfsops.c Wed Feb 9 11:18:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vfsops.c,v 1.287 2010/06/24 13:03:19 hannken Exp $ */
+/* $NetBSD: lfs_vfsops.c,v 1.287.4.1 2011/02/09 11:18:29 bouyer Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lfs_vfsops.c,v 1.287 2010/06/24 13:03:19 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: lfs_vfsops.c,v 1.287.4.1 2011/02/09 11:18:29 bouyer Exp $);
#if defined(_KERNEL_OPT)
#include opt_lfs.h
@@ -1123,21 +1123,8 @@
mutex_exit(lfs_lock);
#ifdef QUOTA
- if (mp-mnt_flag MNT_QUOTA) {
- int i;
- error = vflush(mp, fs-lfs_ivnode, SKIPSYSTEM|flags);
- if (error)
- return (error);
- for (i = 0; i MAXQUOTAS; i++) {
- if (ump-um_quotas[i] == NULLVP)
-continue;
- quotaoff(l, mp, i);
- }
- /*
- * Here we fall through to vflush again to ensure
- * that we have gotten rid of all the system vnodes.
- */
- }
+if ((error = quota1_umount(mp, flags)) != 0)
+ return (error);
#endif
if ((error = vflush(mp, fs-lfs_ivnode, flags)) != 0)
return (error);
Index: src/sys/ufs/ufs/quota.h
diff -u src/sys/ufs/ufs/quota.h:1.25.64.2 src/sys/ufs/ufs/quota.h:1.25.64.3
--- src/sys/ufs/ufs/quota.h:1.25.64.2 Mon Jan 31 15:19:21 2011
+++ src/sys/ufs/ufs/quota.h Wed Feb 9 11:18:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: quota.h,v 1.25.64.2 2011/01/31 15:19:21 bouyer Exp $ */
+/* $NetBSD: quota.h,v 1.25.64.3 2011/02/09 11:18:29 bouyer Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -59,7 +59,6 @@
#define INITQFNAMES { \
user, /* USRQUOTA */ \
group, /* GRPQUOTA */ \
- undefined, \
}
/* definition of limits types for each quota */
Index: src/sys/ufs/ufs/quota1.h
diff -u src/sys/ufs/ufs/quota1.h:1.1.2.2 src/sys/ufs/ufs/quota1.h:1.1.2.3
--- src/sys/ufs/ufs/quota1.h:1.1.2.2 Fri Jan 28 23:31:16 2011
+++ src/sys/ufs/ufs/quota1.h Wed Feb 9 11:18:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: quota1.h,v 1.1.2.2 2011/01/28 23:31:16 bouyer Exp $ */
+/* $NetBSD: quota1.h,v 1.1.2.3 2011/02/09 11:18:30 bouyer Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -93,6 +93,7 @@
};
/* quota1_subr.c */
+struct quota2_entry;
void dqblk2q2e(const struct dqblk *, struct quota2_entry *);
void q2e2dqblk(const struct quota2_entry *, struct dqblk *);
Index: src/sys/ufs/ufs/ufs_quota.c
diff -u src/sys/ufs/ufs/ufs_quota.c:1.68.4.9 src/sys/ufs/ufs/ufs_quota.c:1.68.4.10
--- src/sys/ufs/ufs/ufs_quota.c:1.68.4.9 Tue Feb 8 20:00:53 2011
+++ src/sys/ufs/ufs/ufs_quota.c Wed Feb 9 11:18:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota.c,v 1.68.4.9 2011/02/08 20:00:53 bouyer Exp $ */
+/* $NetBSD: ufs_quota.c,v 1.68.4.10 2011/02/09 11:18:30 bouyer Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.68.4.9 2011/02/08 20:00:53 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.68.4.10 2011/02/09 11:18:30 bouyer Exp $);
#if defined(_KERNEL_OPT)
#include
CVS commit: src/sbin/raidctl
Module Name:src
Committed By: pooka
Date: Wed Feb 9 11:22:49 UTC 2011
Modified Files:
src/sbin/raidctl: prog_ops.h raidctl.c raidctl_hostops.c
raidctl_rumpops.c
Log Message:
Exterminate a bug I created in 2009.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sbin/raidctl/prog_ops.h \
src/sbin/raidctl/raidctl_hostops.c src/sbin/raidctl/raidctl_rumpops.c
cvs rdiff -u -r1.50 -r1.51 src/sbin/raidctl/raidctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/raidctl/prog_ops.h
diff -u src/sbin/raidctl/prog_ops.h:1.1 src/sbin/raidctl/prog_ops.h:1.2
--- src/sbin/raidctl/prog_ops.h:1.1 Wed Dec 15 18:37:55 2010
+++ src/sbin/raidctl/prog_ops.h Wed Feb 9 11:22:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: prog_ops.h,v 1.1 2010/12/15 18:37:55 pooka Exp $ */
+/* $NetBSD: prog_ops.h,v 1.2 2011/02/09 11:22:49 pooka Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -37,6 +37,7 @@
int (*op_open)(const char *, int, ...);
int (*op_ioctl)(int, unsigned long, ...);
+ int (*op_fstat)(int, struct stat *);
int (*op_close)(int);
};
extern const struct prog_ops prog_ops;
@@ -44,11 +45,13 @@
#define prog_init prog_ops.op_init
#define prog_open prog_ops.op_open
#define prog_ioctl prog_ops.op_ioctl
+#define prog_fstat prog_ops.op_fstat
#define prog_close prog_ops.op_close
#else
#define prog_init ((int (*)(void))NULL)
#define prog_open open
#define prog_ioctl ioctl
+#define prog_fstat fstat
#define prog_close close
#endif
Index: src/sbin/raidctl/raidctl_hostops.c
diff -u src/sbin/raidctl/raidctl_hostops.c:1.1 src/sbin/raidctl/raidctl_hostops.c:1.2
--- src/sbin/raidctl/raidctl_hostops.c:1.1 Wed Dec 15 18:37:55 2010
+++ src/sbin/raidctl/raidctl_hostops.c Wed Feb 9 11:22:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: raidctl_hostops.c,v 1.1 2010/12/15 18:37:55 pooka Exp $ */
+/* $NetBSD: raidctl_hostops.c,v 1.2 2011/02/09 11:22:49 pooka Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: raidctl_hostops.c,v 1.1 2010/12/15 18:37:55 pooka Exp $);
+__RCSID($NetBSD: raidctl_hostops.c,v 1.2 2011/02/09 11:22:49 pooka Exp $);
#endif /* !lint */
#include sys/types.h
@@ -42,5 +42,6 @@
const struct prog_ops prog_ops = {
.op_open = open,
.op_ioctl = ioctl,
+ .op_fstat = fstat,
.op_close = close,
};
Index: src/sbin/raidctl/raidctl_rumpops.c
diff -u src/sbin/raidctl/raidctl_rumpops.c:1.1 src/sbin/raidctl/raidctl_rumpops.c:1.2
--- src/sbin/raidctl/raidctl_rumpops.c:1.1 Wed Dec 15 18:37:55 2010
+++ src/sbin/raidctl/raidctl_rumpops.c Wed Feb 9 11:22:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: raidctl_rumpops.c,v 1.1 2010/12/15 18:37:55 pooka Exp $ */
+/* $NetBSD: raidctl_rumpops.c,v 1.2 2011/02/09 11:22:49 pooka Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: raidctl_rumpops.c,v 1.1 2010/12/15 18:37:55 pooka Exp $);
+__RCSID($NetBSD: raidctl_rumpops.c,v 1.2 2011/02/09 11:22:49 pooka Exp $);
#endif /* !lint */
#include sys/types.h
@@ -44,5 +44,6 @@
.op_open = rump_sys_open,
.op_ioctl = rump_sys_ioctl,
+ .op_fstat = rump_sys_fstat,
.op_close = rump_sys_close,
};
Index: src/sbin/raidctl/raidctl.c
diff -u src/sbin/raidctl/raidctl.c:1.50 src/sbin/raidctl/raidctl.c:1.51
--- src/sbin/raidctl/raidctl.c:1.50 Wed Dec 15 18:37:55 2010
+++ src/sbin/raidctl/raidctl.c Wed Feb 9 11:22:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: raidctl.c,v 1.50 2010/12/15 18:37:55 pooka Exp $ */
+/* $NetBSD: raidctl.c,v 1.51 2011/02/09 11:22:49 pooka Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: raidctl.c,v 1.50 2010/12/15 18:37:55 pooka Exp $);
+__RCSID($NetBSD: raidctl.c,v 1.51 2011/02/09 11:22:49 pooka Exp $);
#endif
@@ -265,7 +265,7 @@
prog_open);
if (fd == -1)
err(1, Unable to open device file: %s, name);
- if (fstat(fd, st) == -1)
+ if (prog_fstat(fd, st) == -1)
err(1, stat failure on: %s, dev_name);
if (!S_ISBLK(st.st_mode) !S_ISCHR(st.st_mode))
err(1, invalid device: %s, dev_name);
CVS commit: [bouyer-quota2] src/sys/sys
Module Name:src
Committed By: bouyer
Date: Wed Feb 9 11:31:25 UTC 2011
Modified Files:
src/sys/sys [bouyer-quota2]: quota.h
Log Message:
Kill duplicate definitions
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/sys/quota.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/quota.h
diff -u src/sys/sys/quota.h:1.1.2.1 src/sys/sys/quota.h:1.1.2.2
--- src/sys/sys/quota.h:1.1.2.1 Thu Jan 20 14:25:01 2011
+++ src/sys/sys/quota.h Wed Feb 9 11:31:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: quota.h,v 1.1.2.1 2011/01/20 14:25:01 bouyer Exp $ */
+/* $NetBSD: quota.h,v 1.1.2.2 2011/02/09 11:31:25 bouyer Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -30,23 +30,6 @@
#ifndef _SYS_QUOTA_H_
#define _SYS_QUOTA_H_
-/*
- * quota types available in the system. We expect this to be shared
- * by all filesystems.
- */
-#define MAXQUOTAS 2
-#define USRQUOTA 0 /* element used for user quotas */
-#define GRPQUOTA 1 /* element used for group quotas */
-
-/*
- * Definitions for the default names for types above
- */
-#define INITQFNAMES { \
- user, /* USRQUOTA */ \
- group, /* GRPQUOTA */ \
- undefined, \
-}
-
#ifndef _KERNEL
__BEGIN_DECLS
int quotactl(const char *, struct plistref *) __RENAME(__quotactl50);
CVS commit: [bouyer-quota2] src/sys/ufs/ufs
Module Name:src Committed By: bouyer Date: Wed Feb 9 11:37:17 UTC 2011 Modified Files: src/sys/ufs/ufs [bouyer-quota2]: ufs_vfsops.c Log Message: Fix build without quotas To generate a diff of this commit: cvs rdiff -u -r1.40.8.1 -r1.40.8.2 src/sys/ufs/ufs/ufs_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/ufs/ufs/ufs_vfsops.c diff -u src/sys/ufs/ufs/ufs_vfsops.c:1.40.8.1 src/sys/ufs/ufs/ufs_vfsops.c:1.40.8.2 --- src/sys/ufs/ufs/ufs_vfsops.c:1.40.8.1 Thu Jan 20 14:25:03 2011 +++ src/sys/ufs/ufs/ufs_vfsops.c Wed Feb 9 11:37:16 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_vfsops.c,v 1.40.8.1 2011/01/20 14:25:03 bouyer Exp $ */ +/* $NetBSD: ufs_vfsops.c,v 1.40.8.2 2011/02/09 11:37:16 bouyer Exp $ */ /* * Copyright (c) 1991, 1993, 1994 @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ufs_vfsops.c,v 1.40.8.1 2011/01/20 14:25:03 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: ufs_vfsops.c,v 1.40.8.2 2011/02/09 11:37:16 bouyer Exp $); #if defined(_KERNEL_OPT) #include opt_ffs.h @@ -106,7 +106,7 @@ #if !defined(QUOTA) !defined(QUOTA2) (void) mp; - (void) pref; + (void) dict; (void) l; return (EOPNOTSUPP); #else
CVS commit: src/usr.sbin/ldpd
Module Name:src
Committed By: kefren
Date: Wed Feb 9 11:38:57 UTC 2011
Modified Files:
src/usr.sbin/ldpd: mpls_interface.c mpls_routes.c
Log Message:
use RT_ROUNDUP provided by net/route.h
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/ldpd/mpls_interface.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/ldpd/mpls_routes.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ldpd/mpls_interface.c
diff -u src/usr.sbin/ldpd/mpls_interface.c:1.4 src/usr.sbin/ldpd/mpls_interface.c:1.5
--- src/usr.sbin/ldpd/mpls_interface.c:1.4 Tue Jan 4 10:18:42 2011
+++ src/usr.sbin/ldpd/mpls_interface.c Wed Feb 9 11:38:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mpls_interface.c,v 1.4 2011/01/04 10:18:42 kefren Exp $ */
+/* $NetBSD: mpls_interface.c,v 1.5 2011/02/09 11:38:57 kefren Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -32,6 +32,7 @@
#include arpa/inet.h
#include netinet/in.h
#include netmpls/mpls.h
+#include net/route.h
#include sys/param.h
@@ -49,9 +50,6 @@
#include mpls_interface.h
#include mpls_routes.h
-#define ROUNDUP(a) \
- ((a) 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
-
int
mpls_add_label(struct ldp_peer * p, struct rt_msg * inh_rg,
struct in_addr * addr, int len, int label, int rlookup)
@@ -116,7 +114,7 @@
so_gate = (union sockunion *) rgp-m_space;
so_gate = (union sockunion *)((char*)so_gate +
- ROUNDUP(so_gate-sa.sa_len));
+ RT_ROUNDUP(so_gate-sa.sa_len));
if (rgp-m_rtm.rtm_addrs RTA_IFA) {
int li = 1;
so_oldifa = so_gate;
@@ -128,7 +126,7 @@
li++;
for (int i = 0; i li; i++)
so_oldifa = (union sockunion *)((char*)so_oldifa +
- ROUNDUP(so_oldifa-sa.sa_len));
+ RT_ROUNDUP(so_oldifa-sa.sa_len));
}
if (so_gate-sa.sa_family != AF_INET) {
Index: src/usr.sbin/ldpd/mpls_routes.c
diff -u src/usr.sbin/ldpd/mpls_routes.c:1.3 src/usr.sbin/ldpd/mpls_routes.c:1.4
--- src/usr.sbin/ldpd/mpls_routes.c:1.3 Tue Jan 4 10:58:15 2011
+++ src/usr.sbin/ldpd/mpls_routes.c Wed Feb 9 11:38:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mpls_routes.c,v 1.3 2011/01/04 10:58:15 kefren Exp $ */
+/* $NetBSD: mpls_routes.c,v 1.4 2011/02/09 11:38:57 kefren Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -71,14 +71,12 @@
/* Many lines inspired or shamelessly stolen from sbin/route/route.c */
-#define ROUNDUP(a) \
- ((a) 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
#define NEXTADDR(u) \
- do { l = ROUNDUP(u-sa.sa_len); memcpy(cp, u, l); cp += l; } while(0);
+ do { l = RT_ROUNDUP(u-sa.sa_len); memcpy(cp, u, l); cp += l; } while(0);
#define NEXTADDR2(u) \
- do { l = ROUNDUP(u.sa_len); memcpy(cp, u, l); cp += l; } while(0);
+ do { l = RT_ROUNDUP(u.sa_len); memcpy(cp, u, l); cp += l; } while(0);
#define GETNEXT(sunion) \
- (union sockunion *) ((char *) (sunion) + ROUNDUP((sunion)-sa.sa_len))
+ (union sockunion *) ((char *) (sunion) + RT_ROUNDUP((sunion)-sa.sa_len))
int
read_route_socket(char *s, int max)
CVS commit: [bouyer-quota2] src/sys/ufs/ufs
Module Name:src Committed By: bouyer Date: Wed Feb 9 12:01:20 UTC 2011 Modified Files: src/sys/ufs/ufs [bouyer-quota2]: ufs_quota1.c Log Message: Fix typo To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/ufs/ufs/ufs_quota1.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/ufs/ufs/ufs_quota1.c diff -u src/sys/ufs/ufs/ufs_quota1.c:1.1.2.3 src/sys/ufs/ufs/ufs_quota1.c:1.1.2.4 --- src/sys/ufs/ufs/ufs_quota1.c:1.1.2.3 Tue Feb 8 20:00:53 2011 +++ src/sys/ufs/ufs/ufs_quota1.c Wed Feb 9 12:01:20 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_quota1.c,v 1.1.2.3 2011/02/08 20:00:53 bouyer Exp $ */ +/* $NetBSD: ufs_quota1.c,v 1.1.2.4 2011/02/09 12:01:20 bouyer Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993, 1995 @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ufs_quota1.c,v 1.1.2.3 2011/02/08 20:00:53 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: ufs_quota1.c,v 1.1.2.4 2011/02/09 12:01:20 bouyer Exp $); #include sys/param.h #include sys/kernel.h @@ -701,7 +701,7 @@ struct uio auio; int error; - KASSERT(mutex_locked(dq-dq_interlock)); + KASSERT(mutex_owned(dq-dq_interlock)); vn_lock(dqvp, LK_EXCLUSIVE | LK_RETRY); auio.uio_iov = aiov; auio.uio_iovcnt = 1;
CVS commit: src/sys/dev
Module Name:src
Committed By: jmcneill
Date: Wed Feb 9 13:19:19 UTC 2011
Modified Files:
src/sys/dev/wscons: wsdisplay_vcons.c wsdisplay_vconsvar.h
src/sys/dev/wsfb: genfb.c genfbvar.h
Log Message:
add vcons_{enable,disable}_polling and genfb_{enable,disable}_polling
functions, to switch between intr and polling modes when VCONS_DRAW_INTR
is defined
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/wscons/wsdisplay_vcons.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/wscons/wsdisplay_vconsvar.h
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/wsfb/genfb.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/wsfb/genfbvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wscons/wsdisplay_vcons.c
diff -u src/sys/dev/wscons/wsdisplay_vcons.c:1.22 src/sys/dev/wscons/wsdisplay_vcons.c:1.23
--- src/sys/dev/wscons/wsdisplay_vcons.c:1.22 Tue Feb 8 23:06:25 2011
+++ src/sys/dev/wscons/wsdisplay_vcons.c Wed Feb 9 13:19:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_vcons.c,v 1.22 2011/02/08 23:06:25 jmcneill Exp $ */
+/* $NetBSD: wsdisplay_vcons.c,v 1.23 2011/02/09 13:19:18 jmcneill Exp $ */
/*-
* Copyright (c) 2005, 2006 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wsdisplay_vcons.c,v 1.22 2011/02/08 23:06:25 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: wsdisplay_vcons.c,v 1.23 2011/02/09 13:19:18 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -177,6 +177,7 @@
vcons_softintr, vd);
callout_init(vd-intr, 0);
callout_setfunc(vd-intr, vcons_intr, vd);
+ vd-intr_valid = 1;
/* XXX assume that the 'dev' arg is never dereferenced */
config_interrupts((device_t)vd, vcons_intr_enable);
@@ -1426,7 +1427,7 @@
struct vcons_screen *scr = vd-active;
unsigned int dirty;
- if (scr) {
+ if (scr vd-use_intr == 1) {
if (!SCREEN_IS_BUSY(scr)) {
dirty = atomic_swap_uint(scr-scr_dirty, 0);
if (dirty 0) {
@@ -1448,3 +1449,33 @@
callout_schedule(vd-intr, mstohz(33));
}
#endif /* VCONS_DRAW_INTR */
+
+void
+vcons_enable_polling(struct vcons_data *vd)
+{
+ struct vcons_screen *scr = vd-active;
+
+#ifdef VCONS_DRAW_INTR
+ vd-use_intr = 0;
+#endif
+
+ if (scr !SCREEN_IS_BUSY(scr)) {
+ if ((scr-scr_flags VCONS_NO_REDRAW) == 0)
+ vcons_redraw_screen(scr);
+ }
+}
+
+void
+vcons_disable_polling(struct vcons_data *vd)
+{
+#ifdef VCONS_DRAW_INTR
+ struct vcons_screen *scr = vd-active;
+
+ if (!vd-intr_valid)
+ return;
+
+ vd-use_intr = 1;
+ if (scr)
+ atomic_inc_uint(scr-scr_dirty);
+#endif
+}
Index: src/sys/dev/wscons/wsdisplay_vconsvar.h
diff -u src/sys/dev/wscons/wsdisplay_vconsvar.h:1.16 src/sys/dev/wscons/wsdisplay_vconsvar.h:1.17
--- src/sys/dev/wscons/wsdisplay_vconsvar.h:1.16 Tue Feb 8 23:06:25 2011
+++ src/sys/dev/wscons/wsdisplay_vconsvar.h Wed Feb 9 13:19:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_vconsvar.h,v 1.16 2011/02/08 23:06:25 jmcneill Exp $ */
+/* $NetBSD: wsdisplay_vconsvar.h,v 1.17 2011/02/09 13:19:19 jmcneill Exp $ */
/*-
* Copyright (c) 2005, 2006 Michael Lorenz
@@ -137,6 +137,7 @@
#endif
#ifdef VCONS_DRAW_INTR
callout_t intr;
+ int intr_valid;
void *intr_softint;
int use_intr; /* use intr drawing when non-zero */
#endif
@@ -174,4 +175,7 @@
void vcons_replay_msgbuf(struct vcons_screen *);
+void vcons_enable_polling(struct vcons_data *);
+void vcons_disable_polling(struct vcons_data *);
+
#endif /* _WSDISPLAY_VCONS_H_ */
Index: src/sys/dev/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.34 src/sys/dev/wsfb/genfb.c:1.35
--- src/sys/dev/wsfb/genfb.c:1.34 Tue Feb 8 10:52:56 2011
+++ src/sys/dev/wsfb/genfb.c Wed Feb 9 13:19:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.34 2011/02/08 10:52:56 jmcneill Exp $ */
+/* $NetBSD: genfb.c,v 1.35 2011/02/09 13:19:19 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.34 2011/02/08 10:52:56 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.35 2011/02/09 13:19:19 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -685,3 +685,20 @@
genfb_set_backlight(sc, sc-sc_backlight_level - 8);
}
+
+void
+genfb_enable_polling(device_t dev)
+{
+ struct genfb_softc *sc = device_private(dev);
+
+ SCREEN_ENABLE_DRAWING(sc-sc_console_screen);
+ vcons_enable_polling(sc-vd);
+}
+
+void
+genfb_disable_polling(device_t dev)
+{
+ struct genfb_softc *sc = device_private(dev);
+
+ vcons_disable_polling(sc-vd);
+}
Index: src/sys/dev/wsfb/genfbvar.h
diff -u src/sys/dev/wsfb/genfbvar.h:1.18 src/sys/dev/wsfb/genfbvar.h:1.19
--- src/sys/dev/wsfb/genfbvar.h:1.18 Tue Feb 8 10:52:56 2011
+++ src/sys/dev/wsfb/genfbvar.h Wed Feb 9 13:19:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: genfbvar.h,v 1.18 2011/02/08 10:52:56 jmcneill Exp $ */
+/* $NetBSD: genfbvar.h,v 1.19 2011/02/09 13:19:19 jmcneill Exp $ */
/*-
* Copyright (c)
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jmcneill
Date: Wed Feb 9 13:19:53 UTC 2011
Modified Files:
src/sys/dev/pci: genfb_pci.c
Log Message:
switch genfb to polling mode at shutdown
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/genfb_pci.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/dev/pci/genfb_pci.c
diff -u src/sys/dev/pci/genfb_pci.c:1.27 src/sys/dev/pci/genfb_pci.c:1.28
--- src/sys/dev/pci/genfb_pci.c:1.27 Sat Jan 22 15:14:28 2011
+++ src/sys/dev/pci/genfb_pci.c Wed Feb 9 13:19:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_pci.c,v 1.27 2011/01/22 15:14:28 cegger Exp $ */
+/* $NetBSD: genfb_pci.c,v 1.28 2011/02/09 13:19:53 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfb_pci.c,v 1.27 2011/01/22 15:14:28 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfb_pci.c,v 1.28 2011/02/09 13:19:53 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -66,6 +66,7 @@
static paddr_t pci_genfb_mmap(void *, void *, off_t, int);
static int pci_genfb_borrow(void *, bus_addr_t, bus_space_handle_t *);
static int pci_genfb_drm_print(void *, const char *);
+static bool pci_genfb_shutdown(device_t, int);
CFATTACH_DECL_NEW(genfb_pci, sizeof(struct pci_genfb_softc),
pci_genfb_match, pci_genfb_attach, NULL, NULL);
@@ -117,11 +118,13 @@
/* firmware / MD code responsible for restoring the display */
if (sc-sc_gen.sc_pmfcb == NULL)
- pmf_device_register(self, NULL, NULL);
+ pmf_device_register1(self, NULL, NULL,
+ pci_genfb_shutdown);
else
- pmf_device_register(self,
+ pmf_device_register1(self,
sc-sc_gen.sc_pmfcb-gpc_suspend,
- sc-sc_gen.sc_pmfcb-gpc_resume);
+ sc-sc_gen.sc_pmfcb-gpc_resume,
+ pci_genfb_shutdown);
if ((sc-sc_gen.sc_width == 0) || (sc-sc_gen.sc_fbsize == 0)) {
aprint_debug_dev(self, not configured by firmware\n);
@@ -326,3 +329,10 @@
*hdlp = sc-sc_memh;
return 1;
}
+
+static bool
+pci_genfb_shutdown(device_t self, int flags)
+{
+ genfb_enable_polling(self);
+ return true;
+}
CVS commit: src/sys/arch/x86
Module Name:src
Committed By: jmcneill
Date: Wed Feb 9 13:24:24 UTC 2011
Modified Files:
src/sys/arch/x86/include: genfb_machdep.h
src/sys/arch/x86/x86: genfb_machdep.c x86_autoconf.c
Log Message:
if genfb is attached, hook into db_trap_callback to switch in and out of
polling mode as necessary
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/include/genfb_machdep.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/x86/genfb_machdep.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/x86/x86/x86_autoconf.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/arch/x86/include/genfb_machdep.h
diff -u src/sys/arch/x86/include/genfb_machdep.h:1.2 src/sys/arch/x86/include/genfb_machdep.h:1.3
--- src/sys/arch/x86/include/genfb_machdep.h:1.2 Tue Feb 8 20:55:51 2011
+++ src/sys/arch/x86/include/genfb_machdep.h Wed Feb 9 13:24:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_machdep.h,v 1.2 2011/02/08 20:55:51 ahoka Exp $ */
+/* $NetBSD: genfb_machdep.h,v 1.3 2011/02/09 13:24:23 jmcneill Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill jmcne...@invisible.ca
@@ -31,5 +31,7 @@
int x86_genfb_cnattach(void);
void x86_genfb_mtrr_init(uint64_t, uint32_t);
+void x86_genfb_set_console_dev(device_t);
+void x86_genfb_ddb_trap_callback(int);
#endif /* !_X86_GENFB_MACHDEP_H */
Index: src/sys/arch/x86/x86/genfb_machdep.c
diff -u src/sys/arch/x86/x86/genfb_machdep.c:1.6 src/sys/arch/x86/x86/genfb_machdep.c:1.7
--- src/sys/arch/x86/x86/genfb_machdep.c:1.6 Wed Feb 9 02:30:09 2011
+++ src/sys/arch/x86/x86/genfb_machdep.c Wed Feb 9 13:24:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_machdep.c,v 1.6 2011/02/09 02:30:09 jmcneill Exp $ */
+/* $NetBSD: genfb_machdep.c,v 1.7 2011/02/09 13:24:24 jmcneill Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill jmcne...@invisible.ca
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfb_machdep.c,v 1.6 2011/02/09 02:30:09 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfb_machdep.c,v 1.7 2011/02/09 13:24:24 jmcneill Exp $);
#include opt_mtrr.h
@@ -52,6 +52,7 @@
#include dev/wsfont/wsfont.h
#include dev/wscons/wsdisplay_vconsvar.h
+#include dev/wsfb/genfbvar.h
#include arch/x86/include/genfb_machdep.h
#include wsdisplay.h
@@ -65,6 +66,8 @@
extern int acpi_md_vesa_modenum;
#endif
+static device_t x86_genfb_console_dev = NULL;
+
static struct wsscreen_descr x86_genfb_stdscreen = {
std,
0, 0,
@@ -75,6 +78,26 @@
};
void
+x86_genfb_set_console_dev(device_t dev)
+{
+ KASSERT(x86_genfb_console_dev != NULL);
+ x86_genfb_console_dev = dev;
+}
+
+void
+x86_genfb_ddb_trap_callback(int where)
+{
+ if (x86_genfb_console_dev == NULL)
+ return;
+
+ if (where) {
+ genfb_enable_polling(x86_genfb_console_dev);
+ } else {
+ genfb_disable_polling(x86_genfb_console_dev);
+ }
+}
+
+void
x86_genfb_mtrr_init(uint64_t physaddr, uint32_t size)
{
#ifdef MTRR
Index: src/sys/arch/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.54 src/sys/arch/x86/x86/x86_autoconf.c:1.55
--- src/sys/arch/x86/x86/x86_autoconf.c:1.54 Tue Feb 8 10:52:56 2011
+++ src/sys/arch/x86/x86/x86_autoconf.c Wed Feb 9 13:24:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_autoconf.c,v 1.54 2011/02/08 10:52:56 jmcneill Exp $ */
+/* $NetBSD: x86_autoconf.c,v 1.55 2011/02/09 13:24:24 jmcneill Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: x86_autoconf.c,v 1.54 2011/02/08 10:52:56 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: x86_autoconf.c,v 1.55 2011/02/09 13:24:24 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -59,6 +59,13 @@
#include genfb.h
#include wsdisplay.h
#include opt_vga.h
+#include opt_ddb.h
+
+#ifdef DDB
+#include machine/db_machdep.h
+#include ddb/db_sym.h
+#include ddb/db_extern.h
+#endif
#if NACPICA 0
#include dev/acpi/acpivar.h
@@ -692,6 +699,16 @@
mode_callback,
(uint64_t)mode_cb);
}
+
+#if NWSDISPLAY 0 NGENFB 0
+if (device_is_a(dev, genfb)) {
+ x86_genfb_set_console_dev(dev);
+#ifdef DDB
+ db_trap_callback =
+ x86_genfb_ddb_trap_callback;
+#endif
+}
+#endif
}
prop_dictionary_set_bool(dict, is_console, true);
prop_dictionary_set_bool(dict, clear-screen, false);
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: tsutsui
Date: Wed Feb 9 13:37:48 UTC 2011
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.common
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
Add defintions for ews4800mips and hp300 Xorg servers.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.26 -r1.27 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/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/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.52 src/external/mit/xorg/server/drivers/Makefile:1.53
--- src/external/mit/xorg/server/drivers/Makefile:1.52 Sun Jan 2 11:24:20 2011
+++ src/external/mit/xorg/server/drivers/Makefile Wed Feb 9 13:37:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2011/01/02 11:24:20 mrg Exp $
+# $NetBSD: Makefile,v 1.53 2011/02/09 13:37:48 tsutsui Exp $
# xf86-input drivers
@@ -147,6 +147,16 @@
xf86-video-wsfb
.endif # ${MACHINE} == dreamcast
+.if ${MACHINE} == ews4800mips
+SUBDIR+= \
+ xf86-video-wsfb
+.endif # ${MACHINE} == ews4800mips
+
+.if ${MACHINE} == hp300
+SUBDIR+= \
+ xf86-video-wsfb
+.endif # ${MACHINE} == hp300
+
.if ${MACHINE} == hpcarm || \
${MACHINE} == hpcmips || \
${MACHINE} == hpcsh
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.19 src/external/mit/xorg/server/xorg-server/Makefile.common:1.20
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.19 Thu Nov 18 08:20:17 2010
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Wed Feb 9 13:37:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2010/11/18 08:20:17 mrg Exp $
+# $NetBSD: Makefile.common,v 1.20 2011/02/09 13:37:48 tsutsui Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -12,6 +12,8 @@
${MACHINE} == bebox || \
${MACHINE} == cats || \
${MACHINE} == dreamcast || \
+${MACHINE} == ews4800mips || \
+${MACHINE} == hp300 || \
${MACHINE} == hpcarm || \
${MACHINE} == hpcmips || \
${MACHINE} == hpcsh || \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.26 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.27
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.26 Mon Nov 29 09:34:41 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Wed Feb 9 13:37:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2010/11/29 09:34:41 skrll Exp $
+# $NetBSD: Makefile,v 1.27 2011/02/09 13:37:48 tsutsui Exp $
.include ../../../Makefile.serverlib
.include ../../../Makefile.servermod
@@ -54,7 +54,8 @@
.endfor
.endif
-.if ${MACHINE} == hpcmips || \
+.if ${MACHINE} == ews4800mips || \
+${MACHINE} == hpcmips || \
${MACHINE} == sgimips
SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
@@ -84,6 +85,13 @@
.endfor
.endif
+.if ${MACHINE} == hp300
+SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
+.for _FN in ${SRCS.bsd}
+CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+.endfor
+.endif
+
# some platforms will probably need ioperm_noop.c
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: tsutsui Date: Wed Feb 9 13:41:00 UTC 2011 Modified Files: src/distrib/sets/lists/xserver: md.ews4800mips Added Files: src/distrib/sets/lists/xcomp: md.ews4800mips md.hp300 src/distrib/sets/lists/xserver: md.hp300 Log Message: Add lists for ews4800mips and hp300 Xorg servers. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/xcomp/md.ews4800mips cvs rdiff -u -r0 -r1.3 src/distrib/sets/lists/xcomp/md.hp300 cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/xserver/md.ews4800mips cvs rdiff -u -r0 -r1.9 src/distrib/sets/lists/xserver/md.hp300 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/xserver/md.ews4800mips diff -u src/distrib/sets/lists/xserver/md.ews4800mips:1.6 src/distrib/sets/lists/xserver/md.ews4800mips:1.7 --- src/distrib/sets/lists/xserver/md.ews4800mips:1.6 Mon Feb 9 16:28:54 2009 +++ src/distrib/sets/lists/xserver/md.ews4800mips Wed Feb 9 13:41:00 2011 @@ -1,6 +1,120 @@ -# $NetBSD: md.ews4800mips,v 1.6 2009/02/09 16:28:54 abs Exp $ +# $NetBSD: md.ews4800mips,v 1.7 2011/02/09 13:41:00 tsutsui Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/Xews4800mips-unknown- x11 ./usr/X11R6/man/cat1/Xews4800mips.0 -unknown- .cat,x11 ./usr/X11R6/man/html1/Xews4800mips.html -unknown- html,x11 ./usr/X11R6/man/man1/Xews4800mips.1 -unknown- .man,x11 +./usr/X11R7/bin/X -unknown- xorg +./usr/X11R7/bin/Xorg -unknown- xorg +./usr/X11R7/bin/cvt -unknown- xorg +./usr/X11R7/bin/gtf -unknown- xorg +./usr/X11R7/lib/X11/doc/README.DRI -unknown- xorg +./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- xorg +./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/mouse_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdbe.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdbe.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdbe.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libdbe_pic.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libdri_pic.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri2.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri2.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri2.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libdri2_pic.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libextmod.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libextmod.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libextmod_pic.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libglx.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libglx.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libglx.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libglx_pic.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/librecord.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/librecord.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/librecord.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/librecord_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/librecord_pic.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libshadow.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libshadow.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libshadow.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libshadow_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libshadow_pic.a -unknown- xorg +./usr/X11R7/lib/modules/libexa.a -unknown- xorg +./usr/X11R7/lib/modules/libexa.so -unknown- xorg +./usr/X11R7/lib/modules/libexa.so.0 -unknown- xorg +./usr/X11R7/lib/modules/libexa_pic.a -unknown- xorg +./usr/X11R7/lib/modules/libfb.a-unknown- xorg +./usr/X11R7/lib/modules/libfb.so -unknown- xorg +./usr/X11R7/lib/modules/libfb.so.0 -unknown- xorg +./usr/X11R7/lib/modules/libfb_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/libfb_pic.a -unknown- xorg
CVS commit: src/share/man/man4/man4.hp300
Module Name:src
Committed By: tsutsui
Date: Wed Feb 9 14:13:09 UTC 2011
Modified Files:
src/share/man/man4/man4.hp300: dvbox.4 gbox.4 hyper.4 rbox.4 topcat.4
Log Message:
- update SYNOPSIS and SEE ALSO for wscons support
- remove descriptions about obsolete ioctl
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.hp300/dvbox.4 \
src/share/man/man4/man4.hp300/gbox.4 src/share/man/man4/man4.hp300/rbox.4 \
src/share/man/man4/man4.hp300/topcat.4
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.hp300/hyper.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/man4.hp300/dvbox.4
diff -u src/share/man/man4/man4.hp300/dvbox.4:1.5 src/share/man/man4/man4.hp300/dvbox.4:1.6
--- src/share/man/man4/man4.hp300/dvbox.4:1.5 Mon Mar 22 18:58:31 2010
+++ src/share/man/man4/man4.hp300/dvbox.4 Wed Feb 9 14:13:09 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: dvbox.4,v 1.5 2010/03/22 18:58:31 joerg Exp $
+.\ $NetBSD: dvbox.4,v 1.6 2011/02/09 14:13:09 tsutsui Exp $
.\
.\ Copyright (c) 1990, 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -33,7 +33,7 @@
.\
.\ from: @(#)dv.4 8.1 (Berkeley) 6/9/93
.\
-.Dd June 9, 1993
+.Dd February 9, 2011
.Dt DVBOX 4 hp300
.Os
.Sh NAME
@@ -41,6 +41,10 @@
.Nd
.Tn HP98730
``DaVinci'' graphics device interface
+.Sh SYNOPSIS
+.Cd dvbox* at intio?
+.Cd dvbox* at dio? scode ?
+.Cd wsdisplay* at dvbox?
.Sh DESCRIPTION
This driver is for the
.Tn HP98730
@@ -57,108 +61,6 @@
The hardware installation manual describes the procedure for
setting these values.
.Pp
-A user process communicates to the device initially by means of
-.Xr ioctl 2
-calls. For the
-.Tn HP-UX
-.Xr ioctl 2
-calls supported, refer to
-.Tn HP-UX
-manuals.
-The
-.Bx
-calls supported are:
-.Bl -tag -width indent
-.It Dv GRFIOCGINFO
-Get Graphics Info
-.Pp
-Get info about device, setting the entries in the
-.Ar grfinfo
-structure, as defined in
-.In hpdev/grfioctl.h .
-For the standard 98730, the number of planes should be 4. The number of
-colors would therefore be 15, excluding black. If one 98732A frame buffer
-board is installed, there will still be 4 planes, with the 4 planes on the
-colormap board becoming overlay planes. With each additional 98732 frame
-buffer board 4 planes will be added up to a maximum of 32 planes total.
-.It Dv GRFIOCON
-Graphics On
-.Pp
-Turn graphics on by enabling
-.Tn CRT
-output. The screen will come on, displaying
-whatever is in the frame buffer, using whatever colormap is in place.
-.It Dv GRFIOCOFF
-Graphics Off
-.Pp
-Turn graphics off by disabling output to the
-.Tn CRT .
-The frame buffer contents
-are not affected.
-.It Dv GRFIOCMAP
-Map Device to user space
-.Pp
-Map in control registers and frame buffer space. Once the device file is
-mapped, the frame buffer structure is accessible. The structure describing
-the 98730 is defined in
-.In hpdev/grf_dvreg.h .
-.El
-.Sh FILES
-.Bl -tag -width /dev/MAKEDEV.hpux -compact
-.It Pa /dev/grf?
-.Bx
-special file
-.It Pa /dev/crt98730
-.It Pa /dev/ocrt98730
-.Tn HP-UX
-.Em starbase
-special files
-.It Pa /dev/MAKEDEV.hpux
-script for creating
-.Tn HP-UX
-special files
-.El
-.Sh EXAMPLES
-This is a short segment of code showing how the device is opened and mapped
-into user process address space assuming that it is
-.Ql grf0 :
-.Bd -literal -offset indent
-struct dvboxfb *dvbox;
-u_char *Addr, frame_buffer;
-struct grfinfo gi;
-int disp_fd;
-
-disp_fd = open(/dev/grf0,1);
-
-if (ioctl (disp_fd, GRFIOCGINFO, \*[Am]gi) \*[Lt] 0) return -1;
-
-(void) ioctl (disp_fd, GRFIOCON, 0);
-
-Addr = (u_char *) 0;
-if (ioctl (disp_fd, GRFIOCMAP, \*[Am]Addr) \*[Lt] 0) {
-(void) ioctl (disp_fd, GRFIOCOFF, 0);
-return -1;
-}
-dvbox = (dvboxfb *) Addr; /* Control Registers */
-frame_buffer=(u_char *)Addr+gi.gd_regsize; /* Frame buffer memory */
-.Ed
-.Sh DIAGNOSTICS
-None under
-.Bx .
-.Tn HP-UX
-.Tn CE.utilities
-must be used.
-.Sh ERRORS
-.Bl -tag -width [EINVAL]
-.It Bq Er ENODEV
-no such device.
-.It Bq Er EBUSY
-Another process has the device open.
-.It Bq Er EINVAL
-Invalid ioctl specification.
-.El
.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr grf 4
-.Sh BUGS
-Not tested for all configurations of scan board and frame buffer memory boards.
+.Xr wsdisplay 4 ,
+.Xr wscons 4
Index: src/share/man/man4/man4.hp300/gbox.4
diff -u src/share/man/man4/man4.hp300/gbox.4:1.5 src/share/man/man4/man4.hp300/gbox.4:1.6
--- src/share/man/man4/man4.hp300/gbox.4:1.5 Mon Mar 22 18:58:31 2010
+++ src/share/man/man4/man4.hp300/gbox.4 Wed Feb 9 14:13:09 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: gbox.4,v 1.5 2010/03/22 18:58:31 joerg Exp $
+.\ $NetBSD: gbox.4,v 1.6 2011/02/09 14:13:09 tsutsui Exp $
.\
.\ Copyright (c) 1990, 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -33,7 +33,7 @@
.\
.\ from: @(#)gb.4 8.1 (Berkeley) 6/9/93
CVS commit: src/lib/librumpclient
Module Name:src
Committed By: pooka
Date: Wed Feb 9 14:29:58 UTC 2011
Modified Files:
src/lib/librumpclient: rumpclient.c
Log Message:
The following happens when sending mail with mutt via a rump
TCP/IP stack:
* mutt prepares to exec the smtp client: it forks and closes all
file descriptors
* when the next networking syscall is done, rumpclient detects that
the communication fd returned EBADF and does a reconnect,
gets descriptor 0 for the socket and descriptor 1 for kqueue
* mutt opens the mail file and implicitly assumes it'll get 0-2,
but in fact gets 2-4
* mutt execs the smtp agent which tries to read the mail from
stdin (rumpclient communication socket) and fails
Even if mutt correctly did dup2() things would go south when trying
to communicate with the kernel server the next time, since rumpclient
would actually be talking with some mail body instead (well, it
could work, but in that case you'd need to write *really* weird
mails ;).
Hence, prevent rumpclient from using the special fd's 0-2 for its
purposes.
Should fix mutt problem reported by Alexander Nasonov.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/lib/librumpclient/rumpclient.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpclient/rumpclient.c
diff -u src/lib/librumpclient/rumpclient.c:1.26 src/lib/librumpclient/rumpclient.c:1.27
--- src/lib/librumpclient/rumpclient.c:1.26 Mon Feb 7 15:25:41 2011
+++ src/lib/librumpclient/rumpclient.c Wed Feb 9 14:29:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpclient.c,v 1.26 2011/02/07 15:25:41 pooka Exp $ */
+/* $NetBSD: rumpclient.c,v 1.27 2011/02/09 14:29:58 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -68,6 +68,7 @@
ssize_t (*host_sendto)(int, const void *, size_t, int,
const struct sockaddr *, socklen_t);
int (*host_setsockopt)(int, int, int, const void *, socklen_t);
+int (*host_dup)(int);
int (*host_kqueue)(void);
int (*host_kevent)(int, const struct kevent *, size_t,
@@ -543,6 +544,26 @@
static unsigned ptab_idx;
static struct sockaddr *serv_sa;
+/* dup until we get a good fd which does not collide with stdio */
+static int
+dupgood(int myfd)
+{
+ int ofds[3];
+ int i;
+
+ for (i = 0; myfd = 2 myfd != -1; i++) {
+ assert(i __arraycount(ofds));
+ ofds[i] = myfd;
+ myfd = host_dup(myfd);
+ }
+
+ for (i--; i = 0; i--) {
+ host_close(ofds[i]);
+ }
+
+ return myfd;
+}
+
static int
doconnect(bool noisy)
{
@@ -590,7 +611,7 @@
free(clispc.spc_buf);
clispc.spc_off = 0;
- s = host_socket(parsetab[ptab_idx].domain, SOCK_STREAM, 0);
+ s = dupgood(host_socket(parsetab[ptab_idx].domain, SOCK_STREAM, 0));
if (s == -1)
return -1;
@@ -645,7 +666,7 @@
clispc.spc_reconnecting = 0;
/* setup kqueue, we want all signals and the fd */
- if ((kq = host_kqueue()) == -1) {
+ if ((kq = dupgood(host_kqueue())) == -1) {
error = errno;
if (noisy)
fprintf(stderr, rump_sp: cannot setup kqueue);
@@ -711,6 +732,7 @@
FINDSYM(read);
FINDSYM(sendto);
FINDSYM(setsockopt);
+ FINDSYM(dup);
FINDSYM(kqueue);
#if !__NetBSD_Prereq__(5,99,7)
FINDSYM(kevent);
CVS commit: src/tests/lib
Module Name:src
Committed By: pooka
Date: Wed Feb 9 14:32:45 UTC 2011
Modified Files:
src/tests/lib: Makefile
Added Files:
src/tests/lib/librumpclient: Makefile t_fd.c
Log Message:
Add test which checks rumpclient does not use fds 0-2 for its
internal purposes.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/librumpclient/Makefile \
src/tests/lib/librumpclient/t_fd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/Makefile
diff -u src/tests/lib/Makefile:1.11 src/tests/lib/Makefile:1.12
--- src/tests/lib/Makefile:1.11 Sun Feb 6 18:44:29 2011
+++ src/tests/lib/Makefile Wed Feb 9 14:32:45 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2011/02/06 18:44:29 pooka Exp $
+# $NetBSD: Makefile,v 1.12 2011/02/09 14:32:45 pooka Exp $
.include bsd.own.mk
TESTS_SUBDIRS= csu libc libm libevent libobjc libposix libprop librt \
- libpthread librumphijack libutil semaphore
+ libpthread librumpclient librumphijack libutil semaphore
.if ${MKCRYPTO} != no
TESTS_SUBDIRS+= libdes
Added files:
Index: src/tests/lib/librumpclient/Makefile
diff -u /dev/null src/tests/lib/librumpclient/Makefile:1.1
--- /dev/null Wed Feb 9 14:32:46 2011
+++ src/tests/lib/librumpclient/Makefile Wed Feb 9 14:32:45 2011
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2011/02/09 14:32:45 pooka Exp $
+#
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/lib/librumpclient
+
+TESTS_C= t_fd
+
+LDADD+= -lrumpclient
+
+.include bsd.test.mk
Index: src/tests/lib/librumpclient/t_fd.c
diff -u /dev/null src/tests/lib/librumpclient/t_fd.c:1.1
--- /dev/null Wed Feb 9 14:32:46 2011
+++ src/tests/lib/librumpclient/t_fd.c Wed Feb 9 14:32:45 2011
@@ -0,0 +1,92 @@
+/* $NetBSD: t_fd.c,v 1.1 2011/02/09 14:32:45 pooka Exp $ */
+
+/*
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include sys/types.h
+#include sys/stat.h
+
+#include atf-c.h
+#include errno.h
+#include unistd.h
+
+#include rump/rumpclient.h
+#include rump/rump_syscalls.h
+
+#include ../../h_macros.h
+
+ATF_TC_WITH_CLEANUP(bigenough);
+ATF_TC_HEAD(bigenough, tc)
+{
+ atf_tc_set_md_var(tc, descr, Check that rumpclient uses
+ fd 2);
+}
+
+#define RUMPSERV unix://sucket
+
+ATF_TC_BODY(bigenough, tc)
+{
+ struct stat sb;
+
+ RZ(system(rump_server RUMPSERV));
+ RL(setenv(RUMP_SERVER, RUMPSERV, 1));
+
+ RL(dup2(0, 10));
+ RL(dup2(1, 11));
+ RL(dup2(2, 12));
+
+ RL(close(0));
+ RL(close(1));
+ RL(close(2));
+
+ RL(rumpclient_init());
+ RL(rump_sys_getpid());
+
+ ATF_REQUIRE_ERRNO(EBADF, fstat(0, sb) == -1);
+ ATF_REQUIRE_ERRNO(EBADF, fstat(1, sb) == -1);
+ ATF_REQUIRE_ERRNO(EBADF, fstat(2, sb) == -1);
+
+ RL(rump_sys_getpid());
+
+ /* restore these. does it help? */
+ dup2(10, 0);
+ dup2(11, 1);
+ dup2(12, 2);
+}
+
+ATF_TC_CLEANUP(bigenough, tc)
+{
+
+ system(env RUMP_SERVER= RUMPSERV rump.halt);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+ ATF_TP_ADD_TC(tp, bigenough);
+
+ return atf_no_error();
+}
CVS commit: src
Module Name:src Committed By: pooka Date: Wed Feb 9 14:34:42 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests Log Message: more testies To generate a diff of this commit: cvs rdiff -u -r1.244 -r1.245 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.26 -r1.27 src/etc/mtree/NetBSD.dist.tests 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.244 src/distrib/sets/lists/tests/mi:1.245 --- src/distrib/sets/lists/tests/mi:1.244 Tue Feb 8 10:13:13 2011 +++ src/distrib/sets/lists/tests/mi Wed Feb 9 14:34:42 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.244 2011/02/08 10:13:13 pooka Exp $ +# $NetBSD: mi,v 1.245 2011/02/09 14:34:42 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -469,6 +469,8 @@ ./usr/libdata/debug/usr/tests/lib/libpthread/t_status.debug tests-lib-tests debug,atf ./usr/libdata/debug/usr/tests/lib/librt tests-lib-debug ./usr/libdata/debug/usr/tests/lib/librt/t_sem.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/librumpclient tests-lib-debug +./usr/libdata/debug/usr/tests/lib/librumpclient/t_fd.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/librumphijack tests-lib-debug ./usr/libdata/debug/usr/tests/lib/librumphijack/h_netget.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libskeytests-lib-debug @@ -1894,6 +1896,9 @@ ./usr/tests/lib/librttests-lib-tests atf ./usr/tests/lib/librt/Atffile tests-lib-tests atf ./usr/tests/lib/librt/t_sem tests-lib-tests atf +./usr/tests/lib/librumpclienttests-lib-tests atf +./usr/tests/lib/librumpclient/Atffile tests-lib-tests atf +./usr/tests/lib/librumpclient/t_fd tests-lib-tests atf ./usr/tests/lib/librumphijack tests-lib-tests atf ./usr/tests/lib/librumphijack/Atffile tests-lib-tests atf ./usr/tests/lib/librumphijack/h_netget tests-lib-tests atf Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.26 src/etc/mtree/NetBSD.dist.tests:1.27 --- src/etc/mtree/NetBSD.dist.tests:1.26 Tue Feb 8 10:13:13 2011 +++ src/etc/mtree/NetBSD.dist.tests Wed Feb 9 14:34:42 2011 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.26 2011/02/08 10:13:13 pooka Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.27 2011/02/09 14:34:42 pooka Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -75,6 +75,7 @@ ./usr/libdata/debug/usr/tests/lib/libprop ./usr/libdata/debug/usr/tests/lib/libpthread ./usr/libdata/debug/usr/tests/lib/librt +./usr/libdata/debug/usr/tests/lib/librumpclient ./usr/libdata/debug/usr/tests/lib/librumphijack ./usr/libdata/debug/usr/tests/lib/libskey ./usr/libdata/debug/usr/tests/lib/libutil @@ -187,6 +188,7 @@ ./usr/tests/lib/libprop ./usr/tests/lib/libpthread ./usr/tests/lib/librt +./usr/tests/lib/librumpclient ./usr/tests/lib/librumphijack ./usr/tests/lib/libskey ./usr/tests/lib/libutil
CVS commit: src/share/man/man4/man4.hp300
Module Name:src Committed By: wiz Date: Wed Feb 9 14:37:56 UTC 2011 Modified Files: src/share/man/man4/man4.hp300: dvbox.4 gbox.4 hyper.4 rbox.4 topcat.4 Log Message: New sentence, new line. Sort SEE ALSO. Use Dq. Noun is setup. Fix a Dd. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/man4.hp300/dvbox.4 \ src/share/man/man4/man4.hp300/gbox.4 src/share/man/man4/man4.hp300/rbox.4 \ src/share/man/man4/man4.hp300/topcat.4 cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/man4.hp300/hyper.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/man4.hp300/dvbox.4 diff -u src/share/man/man4/man4.hp300/dvbox.4:1.6 src/share/man/man4/man4.hp300/dvbox.4:1.7 --- src/share/man/man4/man4.hp300/dvbox.4:1.6 Wed Feb 9 14:13:09 2011 +++ src/share/man/man4/man4.hp300/dvbox.4 Wed Feb 9 14:37:55 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: dvbox.4,v 1.6 2011/02/09 14:13:09 tsutsui Exp $ +.\ $NetBSD: dvbox.4,v 1.7 2011/02/09 14:37:55 wiz Exp $ .\ .\ Copyright (c) 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -40,7 +40,8 @@ .Nm dvbox .Nd .Tn HP98730 -``DaVinci'' graphics device interface +.Dq DaVinci +graphics device interface .Sh SYNOPSIS .Cd dvbox* at intio? .Cd dvbox* at dio? scode ? @@ -49,18 +50,21 @@ This driver is for the .Tn HP98730 and 98731 graphics device, also known as -the DaVinci. This driver has not been tested with all possible +the DaVinci. +This driver has not been tested with all possible combinations of frame buffer boards and scan boards installed in the device. -The driver merely checks for the existence of the device and does minimal set -up. +The driver merely checks for the existence of the device and does minimal setup. .Pp -The DaVinci can be configured at either the ``internal'' address +The DaVinci can be configured at either the +.Dq internal +address (frame buffer address 0x20, control register space address 0x56) or at an external select code less than 32. -At the internal address it will be the ``preferred'' console device. +At the internal address it will be the +.Dq preferred +console device. The hardware installation manual describes the procedure for setting these values. -.Pp .Sh SEE ALSO -.Xr wsdisplay 4 , -.Xr wscons 4 +.Xr wscons 4 , +.Xr wsdisplay 4 Index: src/share/man/man4/man4.hp300/gbox.4 diff -u src/share/man/man4/man4.hp300/gbox.4:1.6 src/share/man/man4/man4.hp300/gbox.4:1.7 --- src/share/man/man4/man4.hp300/gbox.4:1.6 Wed Feb 9 14:13:09 2011 +++ src/share/man/man4/man4.hp300/gbox.4 Wed Feb 9 14:37:55 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: gbox.4,v 1.6 2011/02/09 14:13:09 tsutsui Exp $ +.\ $NetBSD: gbox.4,v 1.7 2011/02/09 14:37:55 wiz Exp $ .\ .\ Copyright (c) 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -40,7 +40,8 @@ .Nm gb .Nd .Tn HP98700 -``Gatorbox'' graphics device interface +.Dq Gatorbox +graphics device interface .Sh SYNOPSIS .Cd gbox* at intio? .Cd gbox* at dio? scode ? @@ -49,24 +50,33 @@ This driver is for the .Tn HP98700 and 98710 graphics devices, also known as -the Gatorbox. The term ``Gator'' will often be used, and it is not to be -confused with ``Gator'' used in reference to an +the Gatorbox. +The term +.Dq Gator +will often be used, and it is not to be confused with +.Dq Gator +used in reference to an .Tn HP 9837 or 200/237 machine. Also, the term Gatorbox is used for the 98700 alone, with the 98701 frame -buffer memory or with the 98710 accelerator installed. This driver merely -checks for the existence of the device and does minimal set up, as it is +buffer memory or with the 98710 accelerator installed. +This driver merely +checks for the existence of the device and does minimal setup, as it is expected the applications will initialize the device to their requirements. .Pp The 98700 can be used as the only graphics device on a system, in which case -it will be used as the system console. It can also be installed as a secondary -display device. For the first case, the +it will be used as the system console. +It can also be installed as a secondary display device. +For the first case, the .Tn HP .Tn 98287A M.A.D. interface card -should be set to internal control space. This will put the frame buffer at +should be set to internal control space. +This will put the frame buffer at the DIO address 0x20 and the control registers at 0x56. -At this address it will be the ``preferred'' console device (see +At this address it will be the +.Dq preferred +console device (see .Xr cons 4 ) . For use as a secondary device, the 98287A should be set to frame buffer address 0x30, @@ -80,5 +90,5 @@ .%T 98700H Installation Guide contains further configuration information. .Sh SEE ALSO -.Xr wsdisplay 4 , -.Xr wscons 4 +.Xr wscons 4 , +.Xr wsdisplay 4 Index:
CVS commit: src
Module Name:src Committed By: tsutsui Date: Wed Feb 9 15:12:41 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4/man4.hp300: Makefile Added Files: src/share/man/man4: hil.4 hilid.4 hilkbd.4 hilms.4 Removed Files: src/share/man/man4/man4.hp300: grf.4 hil.4 ite.4 Log Message: - pull MI HIL device man pages from OpenBSD - remove obsolete hp300 ite, grf, and hil devices To generate a diff of this commit: cvs rdiff -u -r1.1285 -r1.1286 src/distrib/sets/lists/man/mi cvs rdiff -u -r0 -r1.1 src/share/man/man4/hil.4 src/share/man/man4/hilid.4 \ src/share/man/man4/hilkbd.4 src/share/man/man4/hilms.4 cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/man4.hp300/Makefile cvs rdiff -u -r1.9 -r0 src/share/man/man4/man4.hp300/grf.4 cvs rdiff -u -r1.11 -r0 src/share/man/man4/man4.hp300/hil.4 cvs rdiff -u -r1.8 -r0 src/share/man/man4/man4.hp300/ite.4 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1285 src/distrib/sets/lists/man/mi:1.1286 --- src/distrib/sets/lists/man/mi:1.1285 Tue Feb 8 03:20:14 2011 +++ src/distrib/sets/lists/man/mi Wed Feb 9 15:12:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1285 2011/02/08 03:20:14 haad Exp $ +# $NetBSD: mi,v 1.1286 2011/02/09 15:12:40 tsutsui Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1004,6 +1004,10 @@ ./usr/share/man/cat4/hdaudio.0 man-sys-catman .cat ./usr/share/man/cat4/hdaudiobus.0 man-sys-catman .cat ./usr/share/man/cat4/hifn.0 man-sys-catman .cat +./usr/share/man/cat4/hil.0 man-sys-catman .cat +./usr/share/man/cat4/hilkbd.0 man-sys-catman .cat +./usr/share/man/cat4/hilid.0 man-sys-catman .cat +./usr/share/man/cat4/hilms.0 man-sys-catman .cat ./usr/share/man/cat4/hme.0 man-sys-catman .cat ./usr/share/man/cat4/hp300/apci.0 man-obsolete obsolete ./usr/share/man/cat4/hp300/autoconf.0 man-sys-catman .cat @@ -1020,14 +1024,14 @@ ./usr/share/man/cat4/hp300/frodo.0 man-sys-catman .cat ./usr/share/man/cat4/hp300/gb.0 man-obsolete obsolete ./usr/share/man/cat4/hp300/gbox.0 man-sys-catman .cat -./usr/share/man/cat4/hp300/grf.0 man-sys-catman .cat -./usr/share/man/cat4/hp300/hil.0 man-sys-catman .cat +./usr/share/man/cat4/hp300/grf.0 man-obsolete obsolete +./usr/share/man/cat4/hp300/hil.0 man-obsolete obsolete ./usr/share/man/cat4/hp300/hpib.0 man-sys-catman .cat ./usr/share/man/cat4/hp300/hpibbus.0 man-sys-catman .cat ./usr/share/man/cat4/hp300/hyper.0 man-sys-catman .cat ./usr/share/man/cat4/hp300/intio.0 man-sys-catman .cat ./usr/share/man/cat4/hp300/intro.0 man-sys-catman .cat -./usr/share/man/cat4/hp300/ite.0 man-sys-catman .cat +./usr/share/man/cat4/hp300/ite.0 man-obsolete obsolete ./usr/share/man/cat4/hp300/kmem.0 man-sys-catman .cat ./usr/share/man/cat4/hp300/le.0 man-obsolete obsolete ./usr/share/man/cat4/hp300/mem.0 man-sys-catman .cat @@ -3759,6 +3763,10 @@ ./usr/share/man/html4/hdaudiobus.html man-sys-htmlman html ./usr/share/man/html4/hdaudio.html man-sys-htmlman html ./usr/share/man/html4/hifn.html man-sys-htmlman html +./usr/share/man/html4/hil.html man-sys-htmlman html +./usr/share/man/html4/hilkbd.html man-sys-htmlman html +./usr/share/man/html4/hilid.html man-sys-htmlman html +./usr/share/man/html4/hilms.html man-sys-htmlman html ./usr/share/man/html4/hme.html man-sys-htmlman html ./usr/share/man/html4/hp300/autoconf.html man-sys-htmlman html ./usr/share/man/html4/hp300/cons.html man-sys-htmlman html @@ -3770,14 +3778,14 @@ ./usr/share/man/html4/hp300/fhpib.html man-sys-htmlman html ./usr/share/man/html4/hp300/frodo.html man-sys-htmlman html ./usr/share/man/html4/hp300/gbox.html man-sys-htmlman html -./usr/share/man/html4/hp300/grf.html man-sys-htmlman html -./usr/share/man/html4/hp300/hil.html man-sys-htmlman html +./usr/share/man/html4/hp300/grf.html man-obsolete obsolete +./usr/share/man/html4/hp300/hil.html man-obsolete obsolete ./usr/share/man/html4/hp300/hpib.html man-sys-htmlman html ./usr/share/man/html4/hp300/hpibbus.html man-sys-htmlman html ./usr/share/man/html4/hp300/hyper.html man-sys-htmlman html ./usr/share/man/html4/hp300/intio.html man-sys-htmlman html ./usr/share/man/html4/hp300/intro.html man-sys-htmlman html -./usr/share/man/html4/hp300/ite.html man-sys-htmlman html +./usr/share/man/html4/hp300/ite.html man-obsolete obsolete ./usr/share/man/html4/hp300/kmem.html man-sys-htmlman html ./usr/share/man/html4/hp300/mem.html man-sys-htmlman html ./usr/share/man/html4/hp300/nhpib.html man-sys-htmlman html @@ -6291,6 +6299,10 @@ ./usr/share/man/man4/hdaudio.4 man-sys-man .man ./usr/share/man/man4/hdaudiobus.4 man-sys-man .man ./usr/share/man/man4/hifn.4 man-sys-man .man +./usr/share/man/man4/hil.4 man-sys-man .man
CVS commit: src/share/man/man4
Module Name:src Committed By: tsutsui Date: Wed Feb 9 15:31:30 UTC 2011 Modified Files: src/share/man/man4: Makefile Log Message: Don't forget to build and install MI HIL man pages. To generate a diff of this commit: cvs rdiff -u -r1.548 -r1.549 src/share/man/man4/Makefile 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/Makefile diff -u src/share/man/man4/Makefile:1.548 src/share/man/man4/Makefile:1.549 --- src/share/man/man4/Makefile:1.548 Wed Jan 26 18:48:12 2011 +++ src/share/man/man4/Makefile Wed Feb 9 15:31:30 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.548 2011/01/26 18:48:12 bouyer Exp $ +# $NetBSD: Makefile,v 1.549 2011/02/09 15:31:30 tsutsui Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -125,6 +125,9 @@ # machine-independent SD/MMC devices MAN += sbt.4 sdhc.4 sdmmc.4 +# machine-independent HIL devices +MAN += hil.4 hilkbd.4 hilid.4 hilms.4 + # IPv6/IPsec MAN+= faith.4 gif.4 inet6.4 icmp6.4 ip6.4 ipsec.4 stf.4
CVS commit: [bouyer-quota2] src/sys/compat/netbsd32
Module Name:src
Committed By: bouyer
Date: Wed Feb 9 16:09:55 UTC 2011
Modified Files:
src/sys/compat/netbsd32 [bouyer-quota2]: netbsd32_netbsd.c
syscalls.master
Log Message:
Proper definitions for quotactl
To generate a diff of this commit:
cvs rdiff -u -r1.168.4.1 -r1.168.4.2 \
src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.84.6.1 -r1.84.6.2 src/sys/compat/netbsd32/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.168.4.1 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.168.4.2
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.168.4.1 Thu Jan 20 14:24:55 2011
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Wed Feb 9 16:09:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.168.4.1 2011/01/20 14:24:55 bouyer Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.168.4.2 2011/02/09 16:09:55 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_netbsd.c,v 1.168.4.1 2011/01/20 14:24:55 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_netbsd.c,v 1.168.4.2 2011/02/09 16:09:55 bouyer Exp $);
#if defined(_KERNEL_OPT)
#include opt_ddb.h
@@ -1185,7 +1185,7 @@
}
int
-netbsd32_quotactl50(struct lwp *l, const struct netbsd32_quotactl_args *uap, register_t *retval)
+compat_50_netbsd32_quotactl(struct lwp *l, const struct compat_50_netbsd32_quotactl_args *uap, register_t *retval)
{
/* {
syscallarg(const netbsd32_charp) path;
@@ -1193,23 +1193,23 @@
syscallarg(int) uid;
syscallarg(netbsd32_voidp) arg;
} */
- struct sys_quotactl_args ua;
+ struct compat_50_sys_quotactl_args ua;
NETBSD32TOP_UAP(path, const char);
NETBSD32TO64_UAP(cmd);
NETBSD32TO64_UAP(uid);
NETBSD32TOP_UAP(arg, void *);
- return (sys_quotactl50(l, ua, retval));
+ return (compat_50_sys_quotactl(l, ua, retval));
}
int
-netbsd32_quotactl(struct lwp *l, const struct netbsd32_quotactl_args *uap, register_t *retval)
+netbsd32___quotactl50(struct lwp *l, const struct netbsd32___quotactl50_args *uap, register_t *retval)
{
/* {
syscallarg(const netbsd32_charp) path;
syscallarg(void *) v;
} */
- struct sys_quotactl_args ua;
+ //struct sys___quotactl50_args ua;
return EOPNOTSUPP;
#if 0
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.84.6.1 src/sys/compat/netbsd32/syscalls.master:1.84.6.2
--- src/sys/compat/netbsd32/syscalls.master:1.84.6.1 Thu Jan 20 14:24:56 2011
+++ src/sys/compat/netbsd32/syscalls.master Wed Feb 9 16:09:55 2011
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.84.6.1 2011/01/20 14:24:56 bouyer Exp $
+ $NetBSD: syscalls.master,v 1.84.6.2 2011/02/09 16:09:55 bouyer Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -304,7 +304,7 @@
netbsd32_orlimitp_t rlp); }
146 COMPAT_43 { int|netbsd32||killpg(int pgid, int signum); }
147 NOARGS { int|sys||setsid(void); }
-148 COMPAT_50 { int|netbsd32||quotactl50(netbsd32_charp path, int cmd, \
+148 COMPAT_50 { int|netbsd32||quotactl(netbsd32_charp path, int cmd, \
int uid, netbsd32_voidp arg); }
149 COMPAT_43 { int|sys||quota(void); } oquota
150 COMPAT_43 { int|netbsd32||ogetsockname(int fdec, \
@@ -969,5 +969,5 @@
mode_t mode, netbsd32_dev_t dev); }
451 STD { int|netbsd32|50|fhstat(const netbsd32_voidp fhp, \
netbsd32_size_t fh_size, netbsd32_statp_t sb); }
-452 STD { int|sys||quotactl(const char *path, \
+452 STD { int|netbsd32|50|quotactl(const netbsd32_charp path, \
netbsd32_voidp pref); }
CVS commit: [bouyer-quota2] src/sys/compat/netbsd32
Module Name:src
Committed By: bouyer
Date: Wed Feb 9 16:10:19 UTC 2011
Modified Files:
src/sys/compat/netbsd32 [bouyer-quota2]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_sysent.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.92.6.1 -r1.92.6.2 src/sys/compat/netbsd32/netbsd32_syscall.h \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.91.6.1 -r1.91.6.2 \
src/sys/compat/netbsd32/netbsd32_syscalls.c \
src/sys/compat/netbsd32/netbsd32_sysent.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/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.92.6.1 src/sys/compat/netbsd32/netbsd32_syscall.h:1.92.6.2
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.92.6.1 Thu Jan 20 14:24:55 2011
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed Feb 9 16:10:18 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.92.6.1 2011/01/20 14:24:55 bouyer Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.92.6.2 2011/02/09 16:10:18 bouyer Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.84 2010/03/02 21:07:21 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.84.6.2 2011/02/09 16:09:55 bouyer Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -432,8 +432,8 @@
/* syscall: setsid ret: int args: */
#define NETBSD32_SYS_setsid 147
-/* syscall: compat_50_netbsd32_quotactl50 ret: int args: netbsd32_charp int int netbsd32_voidp */
-#define NETBSD32_SYS_compat_50_netbsd32_quotactl50 148
+/* syscall: compat_50_netbsd32_quotactl ret: int args: netbsd32_charp int int netbsd32_voidp */
+#define NETBSD32_SYS_compat_50_netbsd32_quotactl 148
/* syscall: compat_43_oquota ret: int args: */
#define NETBSD32_SYS_compat_43_oquota 149
@@ -1196,8 +1196,8 @@
/* syscall: netbsd32___fhstat50 ret: int args: const netbsd32_voidp netbsd32_size_t netbsd32_statp_t */
#define NETBSD32_SYS_netbsd32___fhstat50 451
-/* syscall: quotactl ret: int args: const char * netbsd32_voidp */
-#define NETBSD32_SYS_quotactl 452
+/* syscall: netbsd32___quotactl50 ret: int args: const netbsd32_charp netbsd32_voidp */
+#define NETBSD32_SYS_netbsd32___quotactl50 452
#define NETBSD32_SYS_MAXSYSCALL 453
#define NETBSD32_SYS_NSYSENT 512
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.92.6.1 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.92.6.2
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.92.6.1 Thu Jan 20 14:24:55 2011
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed Feb 9 16:10:18 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.92.6.1 2011/01/20 14:24:55 bouyer Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.92.6.2 2011/02/09 16:10:18 bouyer Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.84 2010/03/02 21:07:21 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.84.6.2 2011/02/09 16:09:55 bouyer Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -801,13 +801,13 @@
};
check_syscall_args(compat_43_netbsd32_killpg)
-struct compat_50_netbsd32_quotactl50_args {
+struct compat_50_netbsd32_quotactl_args {
syscallarg(netbsd32_charp) path;
syscallarg(int) cmd;
syscallarg(int) uid;
syscallarg(netbsd32_voidp) arg;
};
-check_syscall_args(compat_50_netbsd32_quotactl50)
+check_syscall_args(compat_50_netbsd32_quotactl)
struct compat_43_netbsd32_ogetsockname_args {
syscallarg(int) fdec;
@@ -2303,11 +2303,11 @@
};
check_syscall_args(netbsd32___fhstat50)
-struct sys_quotactl_args {
- syscallarg(const char *) path;
+struct netbsd32___quotactl50_args {
+ syscallarg(const netbsd32_charp) path;
syscallarg(netbsd32_voidp) pref;
};
-check_syscall_args(sys_quotactl)
+check_syscall_args(netbsd32___quotactl50)
/*
* System call prototypes.
@@ -2587,7 +2587,7 @@
int sys_setsid(struct lwp *, const void *, register_t *);
-int compat_50_netbsd32_quotactl50(struct lwp *, const struct compat_50_netbsd32_quotactl50_args *, register_t *);
+int compat_50_netbsd32_quotactl(struct lwp *, const struct compat_50_netbsd32_quotactl_args *, register_t *);
int compat_43_sys_quota(struct lwp *, const void *, register_t *);
@@ -3085,6 +3085,6 @@
int netbsd32___fhstat50(struct lwp *, const struct netbsd32___fhstat50_args *, register_t *);
-int sys_quotactl(struct lwp *, const struct sys_quotactl_args *, register_t *);
+int netbsd32___quotactl50(struct lwp *, const struct netbsd32___quotactl50_args *, register_t *);
#endif /* _NETBSD32_SYS_SYSCALLARGS_H_ */
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.91.6.1 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.91.6.2
---
CVS commit: [bouyer-quota2] src/sys/ufs
Module Name:src
Committed By: bouyer
Date: Wed Feb 9 16:15:01 UTC 2011
Modified Files:
src/sys/ufs [bouyer-quota2]: files.ufs
src/sys/ufs/ufs [bouyer-quota2]: ufs_quota.c ufs_quota.h ufs_quota1.c
Log Message:
Reimplement quotactl commands for quota1
To generate a diff of this commit:
cvs rdiff -u -r1.24.6.2 -r1.24.6.3 src/sys/ufs/files.ufs
cvs rdiff -u -r1.68.4.10 -r1.68.4.11 src/sys/ufs/ufs/ufs_quota.c
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/ufs/ufs/ufs_quota.h
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/ufs/ufs/ufs_quota1.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/ufs/files.ufs
diff -u src/sys/ufs/files.ufs:1.24.6.2 src/sys/ufs/files.ufs:1.24.6.3
--- src/sys/ufs/files.ufs:1.24.6.2 Wed Feb 9 11:18:29 2011
+++ src/sys/ufs/files.ufs Wed Feb 9 16:15:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.ufs,v 1.24.6.2 2011/02/09 11:18:29 bouyer Exp $
+# $NetBSD: files.ufs,v 1.24.6.3 2011/02/09 16:15:01 bouyer Exp $
deffs FFS
deffs EXT2FS
@@ -62,6 +62,7 @@
file ufs/ufs/ufs_quota.c (quota | quota2) (ffs | lfs | mfs | ext2fs)
file ufs/ufs/ufs_quota1.c quota (ffs | lfs | mfs | ext2fs)
file ufs/ufs/ufs_quota2.c quota2 (ffs | lfs | mfs | ext2fs)
+file ufs/ufs/quota1_subr.c quota (ffs | lfs | mfs | ext2fs)
file ufs/ufs/quota2_subr.c quota2 (ffs | lfs | mfs | ext2fs)
file ufs/ufs/quota2_prop.c (quota | quota2) (ffs | lfs | mfs | ext2fs)
file ufs/ufs/ufs_vfsops.c ffs | lfs | mfs | ext2fs
Index: src/sys/ufs/ufs/ufs_quota.c
diff -u src/sys/ufs/ufs/ufs_quota.c:1.68.4.10 src/sys/ufs/ufs/ufs_quota.c:1.68.4.11
--- src/sys/ufs/ufs/ufs_quota.c:1.68.4.10 Wed Feb 9 11:18:30 2011
+++ src/sys/ufs/ufs/ufs_quota.c Wed Feb 9 16:15:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota.c,v 1.68.4.10 2011/02/09 11:18:30 bouyer Exp $ */
+/* $NetBSD: ufs_quota.c,v 1.68.4.11 2011/02/09 16:15:01 bouyer Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.68.4.10 2011/02/09 11:18:30 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.68.4.11 2011/02/09 16:15:01 bouyer Exp $);
#if defined(_KERNEL_OPT)
#include opt_quota.h
@@ -82,6 +82,10 @@
prop_dictionary_t, int, prop_array_t);
static int quota_handle_cmd_clear(struct mount *, struct lwp *,
prop_dictionary_t, int, prop_array_t);
+static int quota_handle_cmd_quotaon(struct mount *, struct lwp *,
+prop_dictionary_t, int, prop_array_t);
+static int quota_handle_cmd_quotaoff(struct mount *, struct lwp *,
+prop_dictionary_t, int, prop_array_t);
/*
* Initialize the quota fields of an inode.
*/
@@ -171,6 +175,16 @@
error = quota_handle_cmd_get_version(mp, l, cmddict, datas);
goto end;
}
+ if (strcmp(cmd, quotaon) == 0) {
+ error = quota_handle_cmd_quotaon(mp, l, cmddict,
+ q2type, datas);
+ goto end;
+ }
+ if (strcmp(cmd, quotaoff) == 0) {
+ error = quota_handle_cmd_quotaoff(mp, l, cmddict,
+ q2type, datas);
+ goto end;
+ }
if (strcmp(cmd, get) == 0) {
error = quota_handle_cmd_get(mp, l, cmddict, q2type, datas);
goto end;
@@ -487,6 +501,69 @@
return error;
}
+static int
+quota_handle_cmd_quotaon(struct mount *mp, struct lwp *l,
+prop_dictionary_t cmddict, int type, prop_array_t datas)
+{
+ prop_dictionary_t data;
+ struct ufsmount *ump = VFSTOUFS(mp);
+ int error;
+ const char *qfile;
+
+ if ((ump-um_flags UFS_QUOTA2) != 0)
+ return EBUSY;
+
+ if (prop_array_count(datas) != 1)
+ return EINVAL;
+
+ data = prop_array_get(datas, 0);
+ if (data == NULL)
+ return ENOMEM;
+ if (!prop_dictionary_get_cstring_nocopy(data, quotafile,
+ qfile))
+ return EINVAL;
+
+ error = kauth_authorize_system(l-l_cred, KAUTH_SYSTEM_FS_QUOTA,
+ KAUTH_REQ_SYSTEM_FS_QUOTA_ONOFF, mp, NULL, NULL);
+ if (error != 0) {
+ return error;
+ }
+#ifdef QUOTA
+ error = quota1_handle_cmd_quotaon(l, ump, type, qfile);
+#else
+ error = EOPNOTSUPP;
+#endif
+
+ return error;
+}
+
+static int
+quota_handle_cmd_quotaoff(struct mount *mp, struct lwp *l,
+prop_dictionary_t cmddict, int type, prop_array_t datas)
+{
+ struct ufsmount *ump = VFSTOUFS(mp);
+ int error;
+
+ if ((ump-um_flags UFS_QUOTA2) != 0)
+ return EOPNOTSUPP;
+
+ if (prop_array_count(datas) != 0)
+ return EINVAL;
+
+ error = kauth_authorize_system(l-l_cred, KAUTH_SYSTEM_FS_QUOTA,
+ KAUTH_REQ_SYSTEM_FS_QUOTA_ONOFF, mp, NULL, NULL);
+ if (error != 0) {
+ return error;
+ }
+#ifdef QUOTA
+ error = quota1_handle_cmd_quotaoff(l, ump, type);
+#else
+ error = EOPNOTSUPP;
+#endif
+
+ return error;
+}
+
/*
* Initialize the quota system.
*/
Index: src/sys/ufs/ufs/ufs_quota.h
diff -u src/sys/ufs/ufs/ufs_quota.h:1.1.2.8 src/sys/ufs/ufs/ufs_quota.h:1.1.2.9
--- src/sys/ufs/ufs/ufs_quota.h:1.1.2.8 Wed Feb 9 11:18:30 2011
+++ src/sys/ufs/ufs/ufs_quota.h Wed Feb 9 16:15:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota.h,v 1.1.2.8
CVS commit: othersrc
Module Name:othersrc
Committed By: pooka
Date: Wed Feb 9 16:38:16 UTC 2011
Modified Files:
othersrc: Makefile.fsu
Log Message:
link in libs which are required these days
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 othersrc/Makefile.fsu
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/Makefile.fsu
diff -u othersrc/Makefile.fsu:1.4 othersrc/Makefile.fsu:1.5
--- othersrc/Makefile.fsu:1.4 Mon Aug 23 17:11:29 2010
+++ othersrc/Makefile.fsu Wed Feb 9 16:38:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.fsu,v 1.4 2010/08/23 17:11:29 stacktic Exp $
+# $NetBSD: Makefile.fsu,v 1.5 2011/02/09 16:38:16 pooka Exp $
#
.include ../../Makefile.gen
@@ -25,6 +25,15 @@
LDADD+= -lrumpdev
.endif
+.if exists(${LIBDIR}/librumpdev_putter.so) || \
+exists(/usr/lib/librumpdev_putter.so)
+LDADD+= -lrumpdev_putter
+.endif
+
+.if exists(${LIBDIR}/librumpdev_disk.so) || exists(/usr/lib/librumpdev_disk.so)
+LDADD+= -lrumpdev_disk -lrumpdev
+.endif
+
LDADD+= -lrump
.if ${OSNAME} == Linux
CVS commit: othersrc/lib/libfsu_mount
Module Name:othersrc Committed By: pooka Date: Wed Feb 9 16:47:14 UTC 2011 Modified Files: othersrc/lib/libfsu_mount: fsu_mount.c Log Message: In case the gentle ukfs_release() fails, do it again mit KRAFT ... err, with FORCE. This decreases the chance the file system will be dirty after we plop with it. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 othersrc/lib/libfsu_mount/fsu_mount.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/lib/libfsu_mount/fsu_mount.c diff -u othersrc/lib/libfsu_mount/fsu_mount.c:1.19 othersrc/lib/libfsu_mount/fsu_mount.c:1.20 --- othersrc/lib/libfsu_mount/fsu_mount.c:1.19 Fri Mar 5 19:37:41 2010 +++ othersrc/lib/libfsu_mount/fsu_mount.c Wed Feb 9 16:47:13 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: fsu_mount.c,v 1.19 2010/03/05 19:37:41 stacktic Exp $ */ +/* $NetBSD: fsu_mount.c,v 1.20 2011/02/09 16:47:13 pooka Exp $ */ /* * Copyright (c) 2008,2009 Arnaud Ysmal. All Rights Reserved. @@ -457,7 +457,9 @@ if (ukfs == NULL) return; - ukfs_release(ukfs, 0); + if (ukfs_release(ukfs, 0) == -1) + ukfs_release(ukfs, UKFS_RELFLAG_FORCE); + } const char *
CVS commit: othersrc
Module Name:othersrc
Committed By: pooka
Date: Wed Feb 9 16:59:27 UTC 2011
Modified Files:
othersrc: Makefile.fsu
Log Message:
duh, revert previous. they were already there
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 othersrc/Makefile.fsu
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/Makefile.fsu
diff -u othersrc/Makefile.fsu:1.5 othersrc/Makefile.fsu:1.6
--- othersrc/Makefile.fsu:1.5 Wed Feb 9 16:38:16 2011
+++ othersrc/Makefile.fsu Wed Feb 9 16:59:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.fsu,v 1.5 2011/02/09 16:38:16 pooka Exp $
+# $NetBSD: Makefile.fsu,v 1.6 2011/02/09 16:59:27 pooka Exp $
#
.include ../../Makefile.gen
@@ -25,15 +25,6 @@
LDADD+= -lrumpdev
.endif
-.if exists(${LIBDIR}/librumpdev_putter.so) || \
-exists(/usr/lib/librumpdev_putter.so)
-LDADD+= -lrumpdev_putter
-.endif
-
-.if exists(${LIBDIR}/librumpdev_disk.so) || exists(/usr/lib/librumpdev_disk.so)
-LDADD+= -lrumpdev_disk -lrumpdev
-.endif
-
LDADD+= -lrump
.if ${OSNAME} == Linux
CVS commit: [bouyer-quota2] src/sys/ufs/ufs
Module Name:src
Committed By: bouyer
Date: Wed Feb 9 17:43:53 UTC 2011
Modified Files:
src/sys/ufs/ufs [bouyer-quota2]: ufs_quota1.c
Log Message:
Make it actually work.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/ufs/ufs/ufs_quota1.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/ufs/ufs/ufs_quota1.c
diff -u src/sys/ufs/ufs/ufs_quota1.c:1.1.2.5 src/sys/ufs/ufs/ufs_quota1.c:1.1.2.6
--- src/sys/ufs/ufs/ufs_quota1.c:1.1.2.5 Wed Feb 9 16:15:01 2011
+++ src/sys/ufs/ufs/ufs_quota1.c Wed Feb 9 17:43:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota1.c,v 1.1.2.5 2011/02/09 16:15:01 bouyer Exp $ */
+/* $NetBSD: ufs_quota1.c,v 1.1.2.6 2011/02/09 17:43:53 bouyer Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ufs_quota1.c,v 1.1.2.5 2011/02/09 16:15:01 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ufs_quota1.c,v 1.1.2.6 2011/02/09 17:43:53 bouyer Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -325,9 +325,9 @@
vpp = ump-um_quotas[type];
- error = pathbuf_copyin(fname, pb);
- if (error) {
- return error;
+ pb = pathbuf_create(fname);
+ if (pb == NULL) {
+ return ENOMEM;
}
NDINIT(nd, LOOKUP, FOLLOW, pb);
if ((error = vn_open(nd, FREAD|FWRITE, 0)) != 0) {
@@ -518,8 +518,16 @@
dqblk2q2e(dq-dq_un.dq1_dqb, q2e);
dqrele(NULLVP, dq);
if (defaultq) {
- q2e.q2e_val[QL_BLOCK].q2v_grace = q2e.q2e_val[QL_BLOCK].q2v_time;
- q2e.q2e_val[QL_FILE].q2v_grace = q2e.q2e_val[QL_FILE].q2v_time;
+ if (q2e.q2e_val[QL_BLOCK].q2v_time 0)
+ q2e.q2e_val[QL_BLOCK].q2v_grace =
+ q2e.q2e_val[QL_BLOCK].q2v_time;
+ else
+ q2e.q2e_val[QL_BLOCK].q2v_grace = MAX_DQ_TIME;
+ if (q2e.q2e_val[QL_FILE].q2v_time 0)
+ q2e.q2e_val[QL_FILE].q2v_grace =
+ q2e.q2e_val[QL_FILE].q2v_time;
+ else
+ q2e.q2e_val[QL_FILE].q2v_grace = MAX_DQ_TIME;
}
dict = q2etoprop(q2e, defaultq);
if (dict == NULL)
@@ -550,10 +558,12 @@
if ((error = dqget(NULLVP, id, ump, type, dq)) != 0)
return error;
mutex_enter(dq-dq_interlock);
- ump-umq1_btime[type] = dq-dq_btime =
- q2e.q2e_val[QL_BLOCK].q2v_grace;
- ump-umq1_itime[type] = dq-dq_itime =
- q2e.q2e_val[QL_FILE].q2v_grace;
+ if (q2e.q2e_val[QL_BLOCK].q2v_grace 0)
+ ump-umq1_btime[type] = dq-dq_btime =
+ q2e.q2e_val[QL_BLOCK].q2v_grace;
+ if (q2e.q2e_val[QL_FILE].q2v_grace 0)
+ ump-umq1_itime[type] = dq-dq_itime =
+ q2e.q2e_val[QL_FILE].q2v_grace;
mutex_exit(dq-dq_interlock);
dq-dq_flags |= DQ_MOD;
dqrele(NULLVP, dq);
CVS commit: [bouyer-quota2] src/usr.sbin/edquota
Module Name:src
Committed By: bouyer
Date: Wed Feb 9 17:48:45 UTC 2011
Modified Files:
src/usr.sbin/edquota [bouyer-quota2]: edquota.c
Log Message:
Fix quota1 grace time format.
To generate a diff of this commit:
cvs rdiff -u -r1.29.16.10 -r1.29.16.11 src/usr.sbin/edquota/edquota.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/edquota/edquota.c
diff -u src/usr.sbin/edquota/edquota.c:1.29.16.10 src/usr.sbin/edquota/edquota.c:1.29.16.11
--- src/usr.sbin/edquota/edquota.c:1.29.16.10 Mon Feb 7 20:31:20 2011
+++ src/usr.sbin/edquota/edquota.c Wed Feb 9 17:48:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: edquota.c,v 1.29.16.10 2011/02/07 20:31:20 bouyer Exp $ */
+/* $NetBSD: edquota.c,v 1.29.16.11 2011/02/09 17:48:45 bouyer Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = from: @(#)edquota.c 8.3 (Berkeley) 4/27/95;
#else
-__RCSID($NetBSD: edquota.c,v 1.29.16.10 2011/02/07 20:31:20 bouyer Exp $);
+__RCSID($NetBSD: edquota.c,v 1.29.16.11 2011/02/09 17:48:45 bouyer Exp $);
#endif
#endif /* not lint */
@@ -794,7 +794,7 @@
last_char(line2) = '\0';
if (dflag version == 1) {
if (sscanf(line1,
- \tblocks:(grace = %s\n, stime) != 1) {
+ \tblocks: (grace = %s\n, stime) != 1) {
warnx(%s:%s: bad format, fsp, line1);
goto out;
}
@@ -808,7 +808,7 @@
goto out;
}
if (sscanf(line2,
- \tinodes:(grace = %s\n, stime) != 1) {
+ \tinodes: (grace = %s\n, stime) != 1) {
warnx(%s:%s: bad format, fsp, line2);
goto out;
}
CVS commit: src/sys/ddb
Module Name:src
Committed By: matt
Date: Wed Feb 9 18:24:45 UTC 2011
Modified Files:
src/sys/ddb: db_trap.c
Log Message:
Since curlwp and curproc must always be non-NULL, remove the == NULL branches.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/ddb/db_trap.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/ddb/db_trap.c
diff -u src/sys/ddb/db_trap.c:1.24 src/sys/ddb/db_trap.c:1.25
--- src/sys/ddb/db_trap.c:1.24 Wed Feb 21 22:59:57 2007
+++ src/sys/ddb/db_trap.c Wed Feb 9 18:24:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trap.c,v 1.24 2007/02/21 22:59:57 thorpej Exp $ */
+/* $NetBSD: db_trap.c,v 1.25 2011/02/09 18:24:44 matt Exp $ */
/*
* Mach Operating System
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_trap.c,v 1.24 2007/02/21 22:59:57 thorpej Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_trap.c,v 1.25 2011/02/09 18:24:44 matt Exp $);
#include sys/param.h
#include sys/proc.h
@@ -75,26 +75,15 @@
(%d loads, %d stores),\n,
db_inst_count, db_load_count, db_store_count);
}
- if (curlwp != NULL) {
- if (bkpt)
-db_printf(Breakpoint);
- else if (watchpt)
-db_printf(Watchpoint);
- else
-db_printf(Stopped);
- if (curproc == NULL)
-db_printf(; curlwp = %p,
- curproc is NULL at\t, curlwp);
- else
-db_printf( in pid %d.%d (%s) at\t,
-curproc-p_pid, curlwp-l_lid,
-curproc-p_comm);
- } else if (bkpt)
- db_printf(Breakpoint at\t);
+ if (bkpt)
+ db_printf(Breakpoint);
else if (watchpt)
- db_printf(Watchpoint at\t);
+ db_printf(Watchpoint);
else
- db_printf(Stopped at\t);
+ db_printf(Stopped);
+ db_printf( in pid %d.%d (%s) at\t,
+ curproc-p_pid, curlwp-l_lid,
+ curproc-p_comm);
db_dot = PC_REGS(DDB_REGS);
db_print_loc_and_inst(db_dot);
CVS commit: [bouyer-quota2] src/sys/ufs/ffs
Module Name:src
Committed By: bouyer
Date: Wed Feb 9 19:49:45 UTC 2011
Modified Files:
src/sys/ufs/ffs [bouyer-quota2]: ffs_quota2.c ffs_vfsops.c
Log Message:
Support MNT_UPDATE for quota2 (especially r/o - r/w transitions)
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/ufs/ffs/ffs_quota2.c
cvs rdiff -u -r1.263.4.2 -r1.263.4.3 src/sys/ufs/ffs/ffs_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/ufs/ffs/ffs_quota2.c
diff -u src/sys/ufs/ffs/ffs_quota2.c:1.1.2.1 src/sys/ufs/ffs/ffs_quota2.c:1.1.2.2
--- src/sys/ufs/ffs/ffs_quota2.c:1.1.2.1 Thu Jan 20 14:25:02 2011
+++ src/sys/ufs/ffs/ffs_quota2.c Wed Feb 9 19:49:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_quota2.c,v 1.1.2.1 2011/01/20 14:25:02 bouyer Exp $ */
+/* $NetBSD: ffs_quota2.c,v 1.1.2.2 2011/02/09 19:49:44 bouyer Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_quota2.c,v 1.1.2.1 2011/01/20 14:25:02 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_quota2.c,v 1.1.2.2 2011/02/09 19:49:44 bouyer Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -82,7 +82,8 @@
if (error)
return error;
-if (fs-fs_quota_flags FS_Q2_DO_TYPE(USRQUOTA)) {
+if (fs-fs_quota_flags FS_Q2_DO_TYPE(USRQUOTA)
+ ump-um_quotas[USRQUOTA] == NULLVP) {
error = VFS_VGET(mp, fs-fs_quotafile[USRQUOTA], vp);
if (error) {
printf(%s: can't vget() user quota inode: %d\n,
@@ -96,7 +97,8 @@
mutex_exit(vp-v_interlock);
VOP_UNLOCK(vp);
}
-if (fs-fs_quota_flags FS_Q2_DO_TYPE(GRPQUOTA)) {
+if (fs-fs_quota_flags FS_Q2_DO_TYPE(GRPQUOTA)
+ ump-um_quotas[GRPQUOTA] == NULLVP) {
error = VFS_VGET(mp, fs-fs_quotafile[GRPQUOTA], vp);
if (error) {
vn_close(ump-um_quotas[USRQUOTA],
Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.263.4.2 src/sys/ufs/ffs/ffs_vfsops.c:1.263.4.3
--- src/sys/ufs/ffs/ffs_vfsops.c:1.263.4.2 Tue Feb 8 20:00:53 2011
+++ src/sys/ufs/ffs/ffs_vfsops.c Wed Feb 9 19:49:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.263.4.2 2011/02/08 20:00:53 bouyer Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.263.4.3 2011/02/09 19:49:44 bouyer Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_vfsops.c,v 1.263.4.2 2011/02/08 20:00:53 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_vfsops.c,v 1.263.4.3 2011/02/09 19:49:44 bouyer Exp $);
#if defined(_KERNEL_OPT)
#include opt_ffs.h
@@ -492,6 +492,16 @@
/*
* Changing from read-only to read/write
*/
+#ifndef QUOTA2
+ if (fs-fs_flags FS_DOQUOTA2) {
+ump-um_flags |= UFS_QUOTA2;
+uprintf(%s: options QUOTA2 not enabled%s\n,
+mp-mnt_stat.f_mntonname,
+(mp-mnt_flag MNT_FORCE) ? :
+, not mounting);
+return EINVAL;
+ }
+#endif
fs-fs_ronly = 0;
fs-fs_clean = 1;
fs-fs_fmod = 1;
@@ -519,6 +529,14 @@
return error;
#endif /* WAPBL */
+#ifdef QUOTA2
+ if (!fs-fs_ronly) {
+ error = ffs_quota2_mount(mp);
+ if (error) {
+return error;
+ }
+ }
+#endif
if (args-fspec == NULL)
return 0;
}
CVS commit: [bouyer-quota2] src/sys/conf
Module Name:src Committed By: bouyer Date: Wed Feb 9 20:32:49 UTC 2011 Modified Files: src/sys/conf [bouyer-quota2]: files Log Message: Put both QUOTA and QUOTA2 in opt_quota.h To generate a diff of this commit: cvs rdiff -u -r1.996.4.2 -r1.996.4.3 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.996.4.2 src/sys/conf/files:1.996.4.3 --- src/sys/conf/files:1.996.4.2 Tue Feb 8 16:19:47 2011 +++ src/sys/conf/files Wed Feb 9 20:32:49 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.996.4.2 2011/02/08 16:19:47 bouyer Exp $ +# $NetBSD: files,v 1.996.4.3 2011/02/09 20:32:49 bouyer Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20100430 @@ -225,7 +225,7 @@ # file system options # -defflagQUOTA QUOTA2 # XXX files.ufs? +defflag opt_quota.h QUOTA QUOTA2 # XXX files.ufs? defflagVNODE_LOCKDEBUG defflagMAGICLINKS
CVS commit: [bouyer-quota2] src
Module Name:src
Committed By: bouyer
Date: Wed Feb 9 20:53:10 UTC 2011
Modified Files:
src/distrib/sets/lists/tests [bouyer-quota2]: mi
src/tests/fs/ffs [bouyer-quota2]: Makefile
Added Files:
src/tests/fs/ffs [bouyer-quota2]: t_quota2_remount.c
Log Message:
Check that upgrading a R/O to R/W mount will properly enable quota2.
To generate a diff of this commit:
cvs rdiff -u -r1.240.2.2 -r1.240.2.3 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.14.2.5 -r1.14.2.6 src/tests/fs/ffs/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/tests/fs/ffs/t_quota2_remount.c
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.240.2.2 src/distrib/sets/lists/tests/mi:1.240.2.3
--- src/distrib/sets/lists/tests/mi:1.240.2.2 Wed Feb 9 10:51:03 2011
+++ src/distrib/sets/lists/tests/mi Wed Feb 9 20:53:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.240.2.2 2011/02/09 10:51:03 bouyer Exp $
+# $NetBSD: mi,v 1.240.2.3 2011/02/09 20:53:10 bouyer Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -1186,6 +1186,7 @@
./usr/tests/fs/ffs/t_clearquota tests-fs-tests atf
./usr/tests/fs/ffs/t_getquota tests-fs-tests atf
./usr/tests/fs/ffs/t_quota2_1 tests-fs-tests atf
+./usr/tests/fs/ffs/t_quota2_remount tests-fs-tests atf
./usr/tests/fs/ffs/t_quotalimit tests-fs-tests atf
./usr/tests/fs/ffs/t_setquota tests-fs-tests atf
./usr/tests/fs/kernfstests-fs-tests
Index: src/tests/fs/ffs/Makefile
diff -u src/tests/fs/ffs/Makefile:1.14.2.5 src/tests/fs/ffs/Makefile:1.14.2.6
--- src/tests/fs/ffs/Makefile:1.14.2.5 Mon Feb 7 20:31:46 2011
+++ src/tests/fs/ffs/Makefile Wed Feb 9 20:53:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14.2.5 2011/02/07 20:31:46 bouyer Exp $
+# $NetBSD: Makefile,v 1.14.2.6 2011/02/09 20:53:10 bouyer Exp $
#
.include bsd.own.mk
@@ -28,6 +28,7 @@
TESTS_C+= t_snapshot_v2
TESTS_C+= t_mount
TESTS_C+= t_quota2_1
+TESTS_C+= t_quota2_remount
LDADD+=-lrumpfs_ffs # ffs
LDADD+=-lrumpdev_fss # snapshot dev
Added files:
Index: src/tests/fs/ffs/t_quota2_remount.c
diff -u /dev/null src/tests/fs/ffs/t_quota2_remount.c:1.1.2.1
--- /dev/null Wed Feb 9 20:53:10 2011
+++ src/tests/fs/ffs/t_quota2_remount.c Wed Feb 9 20:53:10 2011
@@ -0,0 +1,143 @@
+/* $NetBSD: t_quota2_remount.c,v 1.1.2.1 2011/02/09 20:53:10 bouyer Exp $ */
+
+/*
+ * Basic tests for quota2
+ */
+
+#include atf-c.h
+
+#include ../common/h_fsmacros.h
+
+#include sys/types.h
+#include sys/mount.h
+#include sys/statvfs.h
+
+#include stdlib.h
+
+#include ufs/ufs/ufsmount.h
+
+#include rump/rump.h
+#include rump/rump_syscalls.h
+
+#include ../../h_macros.h
+
+static void
+do_quota(const atf_tc_t *tc, int n, const char *newfs_opts, int log)
+{
+ int i;
+ char buf[1024];
+ int res;
+ int fd;
+ struct ufs_args uargs;
+ struct statvfs fst;
+
+ snprintf(buf, sizeof(buf), newfs -q user -q group -F -s 4000 -n %d
+ %s %s, (n + 3), newfs_opts, FSTEST_IMGNAME);
+if (system(buf) == -1)
+atf_tc_fail_errno(cannot create file system);
+
+ rump_init();
+ if (rump_sys_mkdir(FSTEST_MNTNAME, 0777) == -1)
+ atf_tc_fail_errno(mount point create);
+
+ rump_pub_etfs_register(/diskdev, FSTEST_IMGNAME, RUMP_ETFS_BLK);
+
+ uargs.fspec = __UNCONST(/diskdev);
+
+ /* read-only doens't have quota enabled */
+ if (rump_sys_mount(MOUNT_FFS, FSTEST_MNTNAME, MNT_RDONLY,
+ uargs, sizeof(uargs)) == -1)
+ atf_tc_fail_errno(mount ffs ro %s, FSTEST_MNTNAME);
+
+ if (rump_sys_statvfs1(FSTEST_MNTNAME, fst, 0) != 0)
+ atf_tc_fail_errno(statbfs %s (1), FSTEST_MNTNAME);
+
+ if ((fst.f_flag ST_QUOTA) != 0)
+ atf_tc_fail(R/O filesystem has quota);
+
+ /* updating to read-write enables quota */
+ if (rump_sys_mount(MOUNT_FFS, FSTEST_MNTNAME,
+ MNT_UPDATE | (log ? MNT_LOG : 0), uargs, sizeof(uargs)) == -1)
+ atf_tc_fail_errno(mount ffs rw %s, FSTEST_MNTNAME);
+
+ if (rump_sys_statvfs1(FSTEST_MNTNAME, fst, 0) != 0)
+ atf_tc_fail_errno(statbfs %s (2), FSTEST_MNTNAME);
+
+ if ((fst.f_flag ST_QUOTA) == 0)
+ atf_tc_fail(R/W filesystem has no quota);
+
+ /* we can update a second time */
+ if (rump_sys_mount(MOUNT_FFS, FSTEST_MNTNAME,
+ MNT_UPDATE | (log ? MNT_LOG : 0), uargs, sizeof(uargs)) == -1)
+ atf_tc_fail_errno(mount ffs rw(2) %s, FSTEST_MNTNAME);
+
+ if (rump_sys_statvfs1(FSTEST_MNTNAME, fst, 0) != 0)
+ atf_tc_fail_errno(statbfs %s (3), FSTEST_MNTNAME);
+
+ if ((fst.f_flag ST_QUOTA) == 0)
+ atf_tc_fail(R/W filesystem has no quota);
+
+ /* create some files so fsck has something to check */
+ FSTEST_ENTER();
+ RL(rump_sys_chown(., 0, 0));
+ for (i = 0 ; i n; i++) {
+ sprintf(buf, file%d, i);
+ RL(fd = rump_sys_open(buf, O_CREAT | O_RDWR, 0755));
+ sprintf(buf, test file no %d, i);
+ RL(rump_sys_write(fd, buf, strlen(buf)));
+ RL(rump_sys_fchown(fd, i, i+8));
+ rump_sys_close(fd);
CVS commit: [bouyer-quota2] src/sys/ufs/ufs
Module Name:src
Committed By: bouyer
Date: Wed Feb 9 21:17:17 UTC 2011
Modified Files:
src/sys/ufs/ufs [bouyer-quota2]: ufs_quota2.c
Log Message:
Make sure to not try to close the quota vnodes twice.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/sys/ufs/ufs/ufs_quota2.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/ufs/ufs/ufs_quota2.c
diff -u src/sys/ufs/ufs/ufs_quota2.c:1.1.2.11 src/sys/ufs/ufs/ufs_quota2.c:1.1.2.12
--- src/sys/ufs/ufs/ufs_quota2.c:1.1.2.11 Wed Feb 9 11:18:30 2011
+++ src/sys/ufs/ufs/ufs_quota2.c Wed Feb 9 21:17:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota2.c,v 1.1.2.11 2011/02/09 11:18:30 bouyer Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.1.2.12 2011/02/09 21:17:17 bouyer Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ufs_quota2.c,v 1.1.2.11 2011/02/09 11:18:30 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ufs_quota2.c,v 1.1.2.12 2011/02/09 21:17:17 bouyer Exp $);
#include sys/buf.h
#include sys/param.h
@@ -213,7 +213,7 @@
return 0;
for (i = 0; i MAXQUOTAS; i++) {
- if (ump-um_quotas[i]) {
+ if (ump-um_quotas[i] != NULLVP) {
error = vn_close(ump-um_quotas[i], FREAD|FWRITE,
ump-um_cred[i]);
if (error) {
@@ -222,6 +222,7 @@
return error;
}
}
+ ump-um_quotas[i] = NULLVP;
}
return 0;
}
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: macallan
Date: Wed Feb 9 21:18:04 UTC 2011
Added Files:
src/sys/dev/ic: ct65550.c ct65550reg.h ct65550var.h
Log Message:
split out the bus-independent portions of chipsfb
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/dev/ic/ct65550.c src/sys/dev/ic/ct65550reg.h \
src/sys/dev/ic/ct65550var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/dev/ic/ct65550.c
diff -u /dev/null src/sys/dev/ic/ct65550.c:1.1
--- /dev/null Wed Feb 9 21:18:04 2011
+++ src/sys/dev/ic/ct65550.c Wed Feb 9 21:18:04 2011
@@ -0,0 +1,880 @@
+/* $NetBSD: ct65550.c,v 1.1 2011/02/09 21:18:04 macallan Exp $ */
+
+/*
+ * Copyright (c) 2006 Michael Lorenz
+ * All rights reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+/*
+ * A console driver for Chips Technologies 65550 graphics controllers
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: ct65550.c,v 1.1 2011/02/09 21:18:04 macallan Exp $);
+
+#include sys/param.h
+#include sys/systm.h
+#include sys/kernel.h
+#include sys/device.h
+#include sys/kauth.h
+#include sys/bus.h
+#include dev/videomode/videomode.h
+
+#include dev/ic/ct65550reg.h
+#include dev/ic/ct65550var.h
+
+#include opt_wsemul.h
+#include opt_chipsfb.h
+
+static struct vcons_screen chipsfb_console_screen;
+
+extern const u_char rasops_cmap[768];
+
+static void chipsfb_init(struct chipsfb_softc *);
+
+static void chipsfb_cursor(void *, int, int, int);
+static void chipsfb_copycols(void *, int, int, int, int);
+static void chipsfb_erasecols(void *, int, int, int, long);
+static void chipsfb_copyrows(void *, int, int, int);
+static void chipsfb_eraserows(void *, int, int, long);
+
+#if 0
+static int chipsfb_allocattr(void *, int, int, int, long *);
+static void chipsfb_scroll(void *, void *, int);
+static int chipsfb_load_font(void *, void *, struct wsdisplay_font *);
+#endif
+
+static int chipsfb_putcmap(struct chipsfb_softc *,
+ struct wsdisplay_cmap *);
+static int chipsfb_getcmap(struct chipsfb_softc *,
+ struct wsdisplay_cmap *);
+static int chipsfb_putpalreg(struct chipsfb_softc *, uint8_t, uint8_t,
+ uint8_t, uint8_t);
+
+static void chipsfb_bitblt(struct chipsfb_softc *, int, int, int, int,
+ int, int, uint8_t);
+static void chipsfb_rectfill(struct chipsfb_softc *, int, int, int, int,
+ int);
+static void chipsfb_putchar(void *, int, int, u_int, long);
+static void chipsfb_setup_mono(struct chipsfb_softc *, int, int, int,
+ int, uint32_t, uint32_t);
+static void chipsfb_feed(struct chipsfb_softc *, int, uint8_t *);
+
+#if 0
+static void chipsfb_showpal(struct chipsfb_softc *);
+#endif
+static void chipsfb_restore_palette(struct chipsfb_softc *);
+
+static void chipsfb_wait_idle(struct chipsfb_softc *);
+
+struct wsscreen_descr chipsfb_defaultscreen = {
+ default, /* name */
+ 0, 0, /* ncols, nrows */
+ NULL, /* textops */
+ 8, 16, /* fontwidth, fontheight */
+ WSSCREEN_WSCOLORS | WSSCREEN_HILIT, /* capabilities */
+ NULL, /* modecookie */
+};
+
+const struct wsscreen_descr *_chipsfb_scrlist[] = {
+ chipsfb_defaultscreen,
+ /* XXX other formats, graphics screen? */
+};
+
+struct wsscreen_list chipsfb_screenlist = {
+ sizeof(_chipsfb_scrlist) / sizeof(struct wsscreen_descr *), _chipsfb_scrlist
+};
+
+static int chipsfb_ioctl(void *, void *, u_long, void *, int,
+ struct lwp *);
+static paddr_t chipsfb_mmap(void *, void *, off_t, int);
+static void chipsfb_clearscreen(struct chipsfb_softc *);
+static void chipsfb_init_screen(void *, struct vcons_screen *, int,
+ long *);
+
+
+struct wsdisplay_accessops chipsfb_accessops = {
+ chipsfb_ioctl,
+ chipsfb_mmap,
+ NULL, /*
CVS commit: src/sys
Module Name:src
Committed By: macallan
Date: Wed Feb 9 21:21:32 UTC 2011
Modified Files:
src/sys/conf: files
src/sys/dev/pci: chipsfb.c files.pci
Log Message:
use the bus independent stuff from ic/ct65550* and leave only the PCI specific
bits in pci/chipsfb.c
To generate a diff of this commit:
cvs rdiff -u -r1.997 -r1.998 src/sys/conf/files
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/chipsfb.c
cvs rdiff -u -r1.337 -r1.338 src/sys/dev/pci/files.pci
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.997 src/sys/conf/files:1.998
--- src/sys/conf/files:1.997 Sun Feb 6 23:13:04 2011
+++ src/sys/conf/files Wed Feb 9 21:21:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.997 2011/02/06 23:13:04 jmcneill Exp $
+# $NetBSD: files,v 1.998 2011/02/09 21:21:32 macallan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20100430
@@ -1102,12 +1102,18 @@
file dev/ic/vga_raster.c vga_rasterconsole needs-flag
file dev/ic/vga_subr.c vga | vga_rasterconsole
file dev/ic/vga_common.c vga | vga_rasterconsole
+
# Integraphics Systems IGA168x and CyberPro framebuffers (linear non-VGA mode)
#
device igsfb: wsemuldisplaydev, wsrasteremulops, rasops8, vcons, videomode
file dev/ic/igsfb.c igsfb needs-flag
file dev/ic/igsfb_subr.c igsfb
+device chipsfb: wsemuldisplaydev, rasops8, vcons, videomode
+file dev/ic/ct65550.c chipsfb
+defflag opt_chipsfb.h CHIPSFB_DEBUG
+defflag opt_chipsfb.h CHIPSFB_WAIT
+
# STI (hp graphics)
device sti: wsemuldisplaydev
file dev/ic/sti.c sti (sti_pci | sti_gedoens)
Index: src/sys/dev/pci/chipsfb.c
diff -u src/sys/dev/pci/chipsfb.c:1.25 src/sys/dev/pci/chipsfb.c:1.26
--- src/sys/dev/pci/chipsfb.c:1.25 Sat Jan 22 15:14:27 2011
+++ src/sys/dev/pci/chipsfb.c Wed Feb 9 21:21:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: chipsfb.c,v 1.25 2011/01/22 15:14:27 cegger Exp $ */
+/* $NetBSD: chipsfb.c,v 1.26 2011/02/09 21:21:32 macallan Exp $ */
/*
* Copyright (c) 2006 Michael Lorenz
@@ -31,228 +31,43 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: chipsfb.c,v 1.25 2011/01/22 15:14:27 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: chipsfb.c,v 1.26 2011/02/09 21:21:32 macallan Exp $);
#include sys/param.h
#include sys/systm.h
#include sys/kernel.h
#include sys/device.h
-#include sys/malloc.h
-#include sys/callout.h
-#include sys/lwp.h
#include sys/kauth.h
-#include dev/videomode/videomode.h
-
#include dev/pci/pcivar.h
#include dev/pci/pcireg.h
#include dev/pci/pcidevs.h
#include dev/pci/pciio.h
-#include dev/pci/chipsfbreg.h
-
-#include dev/wscons/wsdisplayvar.h
-#include dev/wscons/wsconsio.h
-#include dev/wsfont/wsfont.h
-#include dev/rasops/rasops.h
-#include dev/wscons/wsdisplay_vconsvar.h
#include dev/pci/wsdisplay_pci.h
-#include dev/i2c/i2cvar.h
+
+#include dev/ic/ct65550reg.h
+#include dev/ic/ct65550var.h
#include opt_wsemul.h
#include opt_chipsfb.h
-struct chipsfb_softc {
- struct device sc_dev;
+struct chipsfb_pci_softc {
+ struct chipsfb_softc sc_chips;
pci_chipset_tag_t sc_pc;
pcitag_t sc_pcitag;
-
- bus_space_tag_t sc_memt;
- bus_space_tag_t sc_iot;
- bus_space_handle_t sc_memh;
-
- bus_space_tag_t sc_fbt;
- bus_space_tag_t sc_ioregt;
- bus_space_handle_t sc_fbh;
- bus_space_handle_t sc_ioregh;
- bus_addr_t sc_fb, sc_ioreg;
- bus_size_t sc_fbsize, sc_ioregsize;
-
- void *sc_ih;
-
- size_t memsize;
-
- int bits_per_pixel;
- int width, height, linebytes;
-
- int sc_mode;
- uint32_t sc_bg;
-
- u_char sc_cmap_red[256];
- u_char sc_cmap_green[256];
- u_char sc_cmap_blue[256];
- int sc_dacw;
-
- /*
- * I2C stuff
- * DDC2 clock is on GPIO1, data on GPIO0
- */
- struct i2c_controller sc_i2c;
- uint8_t sc_edid[1024];
- int sc_edidbytes; /* number of bytes read from the monitor */
-
- struct vcons_data vd;
};
-static struct vcons_screen chipsfb_console_screen;
-
-extern const u_char rasops_cmap[768];
-
-static int chipsfb_match(device_t, cfdata_t, void *);
-static void chipsfb_attach(device_t, device_t, void *);
-
-CFATTACH_DECL(chipsfb, sizeof(struct chipsfb_softc), chipsfb_match,
-chipsfb_attach, NULL, NULL);
-
-static void chipsfb_init(struct chipsfb_softc *);
-
-static void chipsfb_cursor(void *, int, int, int);
-static void chipsfb_copycols(void *, int, int, int, int);
-static void chipsfb_erasecols(void *, int, int, int, long);
-static void chipsfb_copyrows(void *, int, int, int);
-static void chipsfb_eraserows(void *, int, int, long);
-
-#if 0
-static int chipsfb_allocattr(void *, int, int, int, long *);
-static void chipsfb_scroll(void *, void *, int);
-static int chipsfb_load_font(void *, void *, struct wsdisplay_font *);
-#endif
-
-static int chipsfb_putcmap(struct chipsfb_softc *,
- struct wsdisplay_cmap *);
-static int chipsfb_getcmap(struct chipsfb_softc *,
- struct wsdisplay_cmap *);
-static int chipsfb_putpalreg(struct chipsfb_softc *, uint8_t,
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Wed Feb 9 21:26:55 UTC 2011 Removed Files: src/sys/dev/pci: chipsfbreg.h Log Message: this is no longer needed, register definitions for chipsfb now live in dev/ic/ct65550reg.h To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/sys/dev/pci/chipsfbreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/atheros/dev
Module Name:src Committed By: matt Date: Wed Feb 9 22:01:44 UTC 2011 Modified Files: src/sys/arch/mips/atheros/dev: com_arbus.c Log Message: Use $NetBSD$ instead of $Id$ To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/atheros/dev/com_arbus.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/arch/mips/atheros/dev/com_arbus.c diff -u src/sys/arch/mips/atheros/dev/com_arbus.c:1.7 src/sys/arch/mips/atheros/dev/com_arbus.c:1.8 --- src/sys/arch/mips/atheros/dev/com_arbus.c:1.7 Mon Apr 28 20:23:28 2008 +++ src/sys/arch/mips/atheros/dev/com_arbus.c Wed Feb 9 22:01:44 2011 @@ -1,4 +1,4 @@ -/* $Id: com_arbus.c,v 1.7 2008/04/28 20:23:28 martin Exp $ */ +/* $NetBSD: com_arbus.c,v 1.8 2011/02/09 22:01:44 matt Exp $ */ /*- * Copyright (c) 2006 Urbana-Champaign Independent Media Center. * Copyright (c) 2006 Garrett D'Amore. @@ -101,7 +101,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com_arbus.c,v 1.7 2008/04/28 20:23:28 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: com_arbus.c,v 1.8 2011/02/09 22:01:44 matt Exp $); #include sys/param.h #include sys/systm.h
CVS commit: src/usr.bin/rpcinfo
Module Name:src
Committed By: christos
Date: Thu Feb 10 00:05:52 UTC 2011
Modified Files:
src/usr.bin/rpcinfo: rpcinfo.c
Log Message:
simplify
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/rpcinfo/rpcinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/rpcinfo/rpcinfo.c
diff -u src/usr.bin/rpcinfo/rpcinfo.c:1.31 src/usr.bin/rpcinfo/rpcinfo.c:1.32
--- src/usr.bin/rpcinfo/rpcinfo.c:1.31 Wed Feb 9 01:26:48 2011
+++ src/usr.bin/rpcinfo/rpcinfo.c Wed Feb 9 19:05:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcinfo.c,v 1.31 2011/02/09 06:26:48 dholland Exp $ */
+/* $NetBSD: rpcinfo.c,v 1.32 2011/02/10 00:05:52 christos Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -1530,15 +1530,13 @@
getvers(const char *arg)
{
char *strptr;
- rpcvers_t vers;
- unsigned long ulvers;
+ u_long vers;
- ulvers = strtoul(arg, strptr, 0);
+ vers = strtoul(arg, strptr, 0);
if (strptr == arg || *strptr != '\0' ||
- (ulvers == ULONG_MAX errno == ERANGE))
+ (vers == ULONG_MAX errno == ERANGE))
errx(1, Illegal version number `%s', arg);
- vers = (rpcvers_t)ulvers;
- return vers;
+ return (rpcvers_t)vers;
}
/*
CVS commit: src/sys/arch
Module Name:src
Committed By: jym
Date: Thu Feb 10 00:23:15 UTC 2011
Modified Files:
src/sys/arch/x86/x86: pmap.c
src/sys/arch/xen/include: xenpmap.h
src/sys/arch/xen/x86: x86_xpmap.c
Log Message:
Use only one function to pin pages with Xen, and provide macros to
call it for different levels (L1 = L4).
Replace all calls to xpq_queue_pin_table(...) in MD code with these new
functions, with proper #ifdef'ing depending on $MACHINE.
Rationale:
- only one function to modify for logging
- pushes responsibility to caller for chosing the proper pin level, rather
than Xen internal functions; this makes the pin level explicit rather than
implicit.
Boot tested for dom0 i386/amd64, PAE included. No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/xen/include/xenpmap.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/xen/x86/x86_xpmap.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/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.116 src/sys/arch/x86/x86/pmap.c:1.117
--- src/sys/arch/x86/x86/pmap.c:1.116 Sat Feb 5 13:50:08 2011
+++ src/sys/arch/x86/x86/pmap.c Thu Feb 10 00:23:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.116 2011/02/05 13:50:08 yamt Exp $ */
+/* $NetBSD: pmap.c,v 1.117 2011/02/10 00:23:14 jym Exp $ */
/*
* Copyright (c) 2007 Manuel Bouyer.
@@ -142,7 +142,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.116 2011/02/05 13:50:08 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.117 2011/02/10 00:23:14 jym Exp $);
#include opt_user_ldt.h
#include opt_lockdebug.h
@@ -1497,7 +1497,7 @@
HYPERVISOR_update_va_mapping(xen_dummy_user_pgd + KERNBASE,
pmap_pa2pte(xen_dummy_user_pgd) | PG_u | PG_V, UVMF_INVLPG);
/* Pin as L4 */
- xpq_queue_pin_table(xpmap_ptom_masked(xen_dummy_user_pgd));
+ xpq_queue_pin_l4_table(xpmap_ptom_masked(xen_dummy_user_pgd));
#endif /* __x86_64__ */
idt_vaddr = virtual_avail; /* don't need pte */
idt_paddr = avail_start;/* steal a page */
@@ -2182,12 +2182,17 @@
if (i == l2tol3(PDIR_SLOT_PTE))
continue;
#endif
- xpq_queue_pin_table(xpmap_ptom_masked(pdirpa));
+
+#ifdef __x86_64__
+ xpq_queue_pin_l4_table(xpmap_ptom_masked(pdirpa));
+#else
+ xpq_queue_pin_l2_table(xpmap_ptom_masked(pdirpa));
+#endif
}
#ifdef PAE
object = ((vaddr_t)pdir) + PAGE_SIZE * l2tol3(PDIR_SLOT_PTE);
(void)pmap_extract(pmap_kernel(), object, pdirpa);
- xpq_queue_pin_table(xpmap_ptom_masked(pdirpa));
+ xpq_queue_pin_l2_table(xpmap_ptom_masked(pdirpa));
#endif
splx(s);
#endif /* XEN */
Index: src/sys/arch/xen/include/xenpmap.h
diff -u src/sys/arch/xen/include/xenpmap.h:1.24 src/sys/arch/xen/include/xenpmap.h:1.25
--- src/sys/arch/xen/include/xenpmap.h:1.24 Fri Oct 23 02:32:33 2009
+++ src/sys/arch/xen/include/xenpmap.h Thu Feb 10 00:23:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xenpmap.h,v 1.24 2009/10/23 02:32:33 snj Exp $ */
+/* $NetBSD: xenpmap.h,v 1.25 2011/02/10 00:23:14 jym Exp $ */
/*
*
@@ -40,10 +40,19 @@
void xpq_flush_queue(void);
void xpq_queue_set_ldt(vaddr_t, uint32_t);
void xpq_queue_tlb_flush(void);
-void xpq_queue_pin_table(paddr_t);
+void xpq_queue_pin_table(paddr_t, int);
void xpq_queue_unpin_table(paddr_t);
int xpq_update_foreign(paddr_t, pt_entry_t, int);
+#define xpq_queue_pin_l1_table(pa) \
+ xpq_queue_pin_table(pa, MMUEXT_PIN_L1_TABLE)
+#define xpq_queue_pin_l2_table(pa) \
+ xpq_queue_pin_table(pa, MMUEXT_PIN_L2_TABLE)
+#define xpq_queue_pin_l3_table(pa) \
+ xpq_queue_pin_table(pa, MMUEXT_PIN_L3_TABLE)
+#define xpq_queue_pin_l4_table(pa) \
+ xpq_queue_pin_table(pa, MMUEXT_PIN_L4_TABLE)
+
extern unsigned long *xpmap_phys_to_machine_mapping;
/*
Index: src/sys/arch/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.23 src/sys/arch/xen/x86/x86_xpmap.c:1.24
--- src/sys/arch/xen/x86/x86_xpmap.c:1.23 Mon Dec 20 21:18:45 2010
+++ src/sys/arch/xen/x86/x86_xpmap.c Thu Feb 10 00:23:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_xpmap.c,v 1.23 2010/12/20 21:18:45 jym Exp $ */
+/* $NetBSD: x86_xpmap.c,v 1.24 2011/02/10 00:23:14 jym Exp $ */
/*
* Copyright (c) 2006 Mathieu Ropert m...@adviseo.fr
@@ -69,7 +69,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: x86_xpmap.c,v 1.23 2010/12/20 21:18:45 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: x86_xpmap.c,v 1.24 2011/02/10 00:23:14 jym Exp $);
#include opt_xen.h
#include opt_ddb.h
@@ -237,40 +237,20 @@
}
void
-xpq_queue_pin_table(paddr_t pa)
+xpq_queue_pin_table(paddr_t pa, int lvl)
{
struct mmuext_op op;
xpq_flush_queue();
- XENPRINTK2((xpq_queue_pin_table: 0x% PRIx64 0x% PRIx64 \n,
- (int64_t)pa, (int64_t)pa));
- op.arg1.mfn = pa PAGE_SHIFT;
-
-#if defined(__x86_64__)
- op.cmd = MMUEXT_PIN_L4_TABLE;
-#else
- op.cmd = MMUEXT_PIN_L2_TABLE;
CVS commit: src
Module Name:src
Committed By: jym
Date: Thu Feb 10 00:43:20 UTC 2011
Modified Files:
src/distrib/i386/floppies: Makefile
src/distrib/i386/floppies/bootfloppy: Makefile
src/distrib/i386/floppies/bootfloppy-com: Makefile
src/distrib/i386/floppies/common: Makefile.bootfloppy boot.cfg
src/distrib/i386/instkernel: Makefile
src/etc/etc.i386: Makefile.inc
Added Files:
src/sys/arch/i386/conf: INSTALL
Log Message:
Reinstate INSTALL kernel for embedded ramdisk installs.
Reasons being:
- INSTALL is GENERIC with an embedded ramdisk, and as such, can benefit from
features included within.
- INSTALL_FLOPPY has its own config(5) file, and is tailored for small
floppy images; it misses features/drivers that could be needed to boot
in a decent environment for recent x86 machines (like ACPI)
- makes it closer to floppies distrib available for amd64
While here, comment out INSTALL_FLOPPY and bootfloppy-big image build. NetBSD
does not use the 3.6MiB image for El Torito cdroms anymore.
Remove the FLOPPYMAX limit; i386 needs 4 floppies now. Modify boot.cfg and
release/contents to reflect reality.
See http://mail-index.netbsd.org/port-i386/2011/02/08/msg002307.html
No comments, no objections.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/distrib/i386/floppies/Makefile
cvs rdiff -u -r1.12 -r1.13 src/distrib/i386/floppies/bootfloppy/Makefile
cvs rdiff -u -r1.7 -r1.8 src/distrib/i386/floppies/bootfloppy-com/Makefile
cvs rdiff -u -r1.22 -r1.23 \
src/distrib/i386/floppies/common/Makefile.bootfloppy
cvs rdiff -u -r1.2 -r1.3 src/distrib/i386/floppies/common/boot.cfg
cvs rdiff -u -r1.12 -r1.13 src/distrib/i386/instkernel/Makefile
cvs rdiff -u -r1.64 -r1.65 src/etc/etc.i386/Makefile.inc
cvs rdiff -u -r0 -r1.327 src/sys/arch/i386/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/i386/floppies/Makefile
diff -u src/distrib/i386/floppies/Makefile:1.37 src/distrib/i386/floppies/Makefile:1.38
--- src/distrib/i386/floppies/Makefile:1.37 Wed Sep 3 22:07:12 2008
+++ src/distrib/i386/floppies/Makefile Thu Feb 10 00:43:19 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2008/09/03 22:07:12 lukem Exp $
+# $NetBSD: Makefile,v 1.38 2011/02/10 00:43:19 jym Exp $
SUBDIR=
SUBDIR+= bootfloppy
-SUBDIR+= bootfloppy-big
SUBDIR+= bootfloppy-com
+# SUBDIR+= bootfloppy-big
# These are all rather archaic...
# SUBDIR+= bootfloppy-ps2
# SUBDIR+= bootfloppy-small
Index: src/distrib/i386/floppies/bootfloppy/Makefile
diff -u src/distrib/i386/floppies/bootfloppy/Makefile:1.12 src/distrib/i386/floppies/bootfloppy/Makefile:1.13
--- src/distrib/i386/floppies/bootfloppy/Makefile:1.12 Wed Apr 30 15:29:11 2008
+++ src/distrib/i386/floppies/bootfloppy/Makefile Thu Feb 10 00:43:19 2011
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2008/04/30 15:29:11 ad Exp $
+# $NetBSD: Makefile,v 1.13 2011/02/10 00:43:19 jym Exp $
FLOPPYBASE= boot
-FLOPPYMAX= 3
-FLOPPYKERNEL= netbsd-INSTALL_FLOPPY.gz
+FLOPPYKERNEL= netbsd-INSTALL.gz
.include ${.CURDIR}/../common/Makefile.bootfloppy
Index: src/distrib/i386/floppies/bootfloppy-com/Makefile
diff -u src/distrib/i386/floppies/bootfloppy-com/Makefile:1.7 src/distrib/i386/floppies/bootfloppy-com/Makefile:1.8
--- src/distrib/i386/floppies/bootfloppy-com/Makefile:1.7 Wed Apr 30 15:29:11 2008
+++ src/distrib/i386/floppies/bootfloppy-com/Makefile Thu Feb 10 00:43:19 2011
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2008/04/30 15:29:11 ad Exp $
+# $NetBSD: Makefile,v 1.8 2011/02/10 00:43:19 jym Exp $
FLOPPYBASE= boot-com
-FLOPPYMAX= 3
-FLOPPYKERNEL= netbsd-INSTALL_FLOPPY.gz
+FLOPPYKERNEL= netbsd-INSTALL.gz
FLOPPYBOOTOPTIONS= -o console=com0
.include ${.CURDIR}/../common/Makefile.bootfloppy
Index: src/distrib/i386/floppies/common/Makefile.bootfloppy
diff -u src/distrib/i386/floppies/common/Makefile.bootfloppy:1.22 src/distrib/i386/floppies/common/Makefile.bootfloppy:1.23
--- src/distrib/i386/floppies/common/Makefile.bootfloppy:1.22 Tue Nov 4 23:02:52 2008
+++ src/distrib/i386/floppies/common/Makefile.bootfloppy Thu Feb 10 00:43:20 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootfloppy,v 1.22 2008/11/04 23:02:52 dbj Exp $
+# $NetBSD: Makefile.bootfloppy,v 1.23 2011/02/10 00:43:20 jym Exp $
#
# Makefile snippet to create a set of USTAR floppies
#
@@ -18,9 +18,6 @@
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
-I386COMMON= ${.CURDIR}/../common
-
-FLOPPYMAX?= 1
FLOPPYSIZE?= 2880
.if defined(FLOPPYSIZE) (${FLOPPYSIZE} != 2880)
FLOPPYMETAFILE!= printf USTAR.volsize.%o ${FLOPPYSIZE}
@@ -34,7 +31,7 @@
FLOPPYKERNOBJ!= cd ${.CURDIR}/../../${FLOPPYKERNDIR} ${PRINTOBJDIR}
FLOPPY_BOOT?= ${MDEC}/boot
-FLOPPY_BOOT_CFG?= ${I386COMMON}/boot.cfg
+FLOPPY_BOOT_CFG?= ${DISTRIBDIR}/${MACHINE}/floppies/common/boot.cfg
FLOPPY_NETBSD= ${FLOPPYKERNOBJ}/${FLOPPYKERNEL}
FLOPPYFILES= boot
CVS commit: src/distrib/notes/common
Module Name:src Committed By: jym Date: Thu Feb 10 00:56:35 UTC 2011 Modified Files: src/distrib/notes/common: contents Log Message: Reflect reality for i386 distrib kernels. To generate a diff of this commit: cvs rdiff -u -r1.165 -r1.166 src/distrib/notes/common/contents 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/contents diff -u src/distrib/notes/common/contents:1.165 src/distrib/notes/common/contents:1.166 --- src/distrib/notes/common/contents:1.165 Sun Jan 30 18:04:41 2011 +++ src/distrib/notes/common/contents Thu Feb 10 00:56:34 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: contents,v 1.165 2011/01/30 18:04:41 phx Exp $ +.\ $NetBSD: contents,v 1.166 2011/02/10 00:56:34 jym Exp $ .\ .\ Copyright (c) 1999-2005 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -91,11 +91,6 @@ The monolithic kernel which doesn't use kernel modules. . It Pa netbsd-INSTALL.gz The installation kernel. -. -. It Pa netbsd-INSTALL_FLOPPY.gz -A version of -.Li INSTALL -for older machines without CD-ROM drives. . It Pa netbsd-INSTALL_XEN3PAE_DOMU.gz . It Pa netbsd-INSTALL_XEN3_DOMU.gz . It Pa netbsd-XEN3PAE_DOMU.gz
CVS commit: src/sys/fs/hfs
Module Name:src
Committed By: christos
Date: Thu Feb 10 01:49:52 UTC 2011
Modified Files:
src/sys/fs/hfs: hfs_vnops.c
Log Message:
PR/44523: Taylor R Campbell: mount_hfs badly handles file names with slashes
in them, encode them as colons. XXX: Should encode : as :: too?
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/fs/hfs/hfs_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/hfs/hfs_vnops.c
diff -u src/sys/fs/hfs/hfs_vnops.c:1.20 src/sys/fs/hfs/hfs_vnops.c:1.21
--- src/sys/fs/hfs/hfs_vnops.c:1.20 Sun Feb 6 22:03:16 2011
+++ src/sys/fs/hfs/hfs_vnops.c Wed Feb 9 20:49:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hfs_vnops.c,v 1.20 2011/02/07 03:03:16 jakllsch Exp $ */
+/* $NetBSD: hfs_vnops.c,v 1.21 2011/02/10 01:49:51 christos Exp $ */
/*-
* Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hfs_vnops.c,v 1.20 2011/02/07 03:03:16 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: hfs_vnops.c,v 1.21 2011/02/10 01:49:51 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_ipsec.h
@@ -408,15 +408,20 @@
*vpp = vdp;
} else {
hfs_callback_args cbargs;
- uint8_t len;
+ uint8_t len, ni;
hfslib_init_cbargs(cbargs);
/* XXX: when decomposing, string could grow
and we have to handle overflow */
- unicn = malloc(cnp-cn_namelen*sizeof(unicn[0]), M_TEMP, M_WAITOK);
+ unicn = malloc(cnp-cn_namelen * sizeof(unicn[0]),
+ M_TEMP, M_WAITOK);
len = utf8_to_utf16(unicn, cnp-cn_namelen,
cnp-cn_nameptr, cnp-cn_namelen, 0, NULL);
+ /* XXX: perhaps check for colons too, and encode them? */
+ for (ni = 0; ni len; ni++)
+ if (unicn[ni] == (unichar_t)'/')
+unicn[ni] = (unichar_t)':';
/* XXX: check conversion errors? */
if (hfslib_make_catalog_key(VTOH(vdp)-h_rec.u.cnid, len, unicn,
key) == 0) {
@@ -879,7 +884,7 @@
off_t bufoff; /* offset in buffer relative to start of dirents */
uint32_t numchildren;
uint32_t curchild; /* index of child we are stuffing into dirent */
- size_t namlen;
+ size_t namlen, ni;
int error;
int i; /* dummy variable */
@@ -927,6 +932,10 @@
/* XXX: how to handle name too long? */
continue;
}
+ /* XXX: perhaps check for colons too, and encode them? */
+ for (ni = 0; ni namlen; ni++)
+ if (curent.d_name[ni] == '/')
+curent.d_name[ni] = ':';
curent.d_namlen = namlen;
curent.d_reclen = _DIRENT_SIZE(curent);
CVS commit: src/sys/fs/hfs
Module Name:src
Committed By: christos
Date: Thu Feb 10 03:30:30 UTC 2011
Modified Files:
src/sys/fs/hfs: hfs_vnops.c
Log Message:
remove comments about needing to encode : since the on disk format does
not allow them. Also fix reversed encoding in lookup. From Taylor R Campbell.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/fs/hfs/hfs_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/hfs/hfs_vnops.c
diff -u src/sys/fs/hfs/hfs_vnops.c:1.21 src/sys/fs/hfs/hfs_vnops.c:1.22
--- src/sys/fs/hfs/hfs_vnops.c:1.21 Wed Feb 9 20:49:51 2011
+++ src/sys/fs/hfs/hfs_vnops.c Wed Feb 9 22:30:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hfs_vnops.c,v 1.21 2011/02/10 01:49:51 christos Exp $ */
+/* $NetBSD: hfs_vnops.c,v 1.22 2011/02/10 03:30:29 christos Exp $ */
/*-
* Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hfs_vnops.c,v 1.21 2011/02/10 01:49:51 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: hfs_vnops.c,v 1.22 2011/02/10 03:30:29 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_ipsec.h
@@ -418,10 +418,9 @@
M_TEMP, M_WAITOK);
len = utf8_to_utf16(unicn, cnp-cn_namelen,
cnp-cn_nameptr, cnp-cn_namelen, 0, NULL);
- /* XXX: perhaps check for colons too, and encode them? */
for (ni = 0; ni len; ni++)
- if (unicn[ni] == (unichar_t)'/')
-unicn[ni] = (unichar_t)':';
+ if (unicn[ni] == (unichar_t)':')
+unicn[ni] = (unichar_t)'/';
/* XXX: check conversion errors? */
if (hfslib_make_catalog_key(VTOH(vdp)-h_rec.u.cnid, len, unicn,
key) == 0) {
@@ -932,7 +931,6 @@
/* XXX: how to handle name too long? */
continue;
}
- /* XXX: perhaps check for colons too, and encode them? */
for (ni = 0; ni namlen; ni++)
if (curent.d_name[ni] == '/')
curent.d_name[ni] = ':';
CVS commit: src/sys/dev/ata
Module Name:src
Committed By: enami
Date: Thu Feb 10 05:07:46 UTC 2011
Modified Files:
src/sys/dev/ata: wd.c
Log Message:
Start new line before issuing IDENTIFY command since messages from
other driver may interfere during waiting for command completion.
To generate a diff of this commit:
cvs rdiff -u -r1.385 -r1.386 src/sys/dev/ata/wd.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/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.385 src/sys/dev/ata/wd.c:1.386
--- src/sys/dev/ata/wd.c:1.385 Fri Nov 5 15:49:37 2010
+++ src/sys/dev/ata/wd.c Thu Feb 10 05:07:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.385 2010/11/05 15:49:37 dyoung Exp $ */
+/* $NetBSD: wd.c,v 1.386 2011/02/10 05:07:46 enami Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wd.c,v 1.385 2010/11/05 15:49:37 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: wd.c,v 1.386 2011/02/10 05:07:46 enami Exp $);
#include opt_ata.h
@@ -281,10 +281,11 @@
wd-drvp-drv_softc = wd-sc_dev;
aprint_naive(\n);
+ aprint_normal(\n);
/* read our drive info */
if (wd_get_params(wd, AT_WAIT, wd-sc_params) != 0) {
- aprint_error(\n%s: IDENTIFY failed\n, device_xname(self));
+ aprint_error_dev(self, IDENTIFY failed\n);
return;
}
@@ -304,7 +305,7 @@
}
*q++ = '\0';
- aprint_normal(: %s\n, tbuf);
+ aprint_normal_dev(self, %s\n, tbuf);
wdq = wd_lookup_quirks(tbuf);
if (wdq != NULL)
CVS commit: src/sys/arch/sgimips/sgimips
Module Name:src Committed By: macallan Date: Thu Feb 10 05:55:26 UTC 2011 Modified Files: src/sys/arch/sgimips/sgimips: bus.c Log Message: PMAP_NOCACHE - PGC_NOCACHE where appropriate To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/sgimips/sgimips/bus.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/arch/sgimips/sgimips/bus.c diff -u src/sys/arch/sgimips/sgimips/bus.c:1.60 src/sys/arch/sgimips/sgimips/bus.c:1.61 --- src/sys/arch/sgimips/sgimips/bus.c:1.60 Tue Jul 6 20:50:35 2010 +++ src/sys/arch/sgimips/sgimips/bus.c Thu Feb 10 05:55:26 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus.c,v 1.60 2010/07/06 20:50:35 cegger Exp $ */ +/* $NetBSD: bus.c,v 1.61 2011/02/10 05:55:26 macallan Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus.c,v 1.60 2010/07/06 20:50:35 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: bus.c,v 1.61 2011/02/10 05:55:26 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -1194,7 +1194,7 @@ return (-1); #if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64) - return (mips_btop(rv | PMAP_NOCACHE)); + return (mips_btop(rv | PGC_NOCACHE)); #else return (mips_btop(rv)); #endif @@ -1211,7 +1211,7 @@ } else #if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64) return mips_btop((MIPS_KSEG1_TO_PHYS(addr) + off) - | PMAP_NOCACHE); + | PGC_NOCACHE); #else return mips_btop((MIPS_KSEG1_TO_PHYS(addr) + off)); #endif
CVS commit: src/crypto/external/bsd/openssl/dist/ssl
Module Name:src
Committed By: spz
Date: Thu Feb 10 06:04:54 UTC 2011
Modified Files:
src/crypto/external/bsd/openssl/dist/ssl: t1_lib.c
Log Message:
fix for CVE-2011-0014 (OCSP stapling vulnerability in OpenSSL)
patch taken from http://www.openssl.org/news/secadv_20110208.txt
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.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/external/bsd/openssl/dist/ssl/t1_lib.c
diff -u src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c:1.3 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c:1.4
--- src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c:1.3 Tue Dec 7 10:03:29 2010
+++ src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c Thu Feb 10 06:04:54 2011
@@ -916,6 +916,7 @@
}
n2s(data, idsize);
dsize -= 2 + idsize;
+ size -= 2 + idsize;
if (dsize 0)
{
*al = SSL_AD_DECODE_ERROR;
@@ -954,9 +955,14 @@
}
/* Read in request_extensions */
+if (size 2)
+ {
+ *al = SSL_AD_DECODE_ERROR;
+ return 0;
+ }
n2s(data,dsize);
size -= 2;
-if (dsize size)
+if (dsize != size)
{
*al = SSL_AD_DECODE_ERROR;
return 0;
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: macallan
Date: Thu Feb 10 06:42:18 UTC 2011
Modified Files:
src/sys/arch/mips/mips: pmap.c
Log Message:
unbork PMAP_NOCACHE vs. PGC_NOCACHE
To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 src/sys/arch/mips/mips/pmap.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/arch/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.193 src/sys/arch/mips/mips/pmap.c:1.194
--- src/sys/arch/mips/mips/pmap.c:1.193 Wed Jan 26 01:18:54 2011
+++ src/sys/arch/mips/mips/pmap.c Thu Feb 10 06:42:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.193 2011/01/26 01:18:54 pooka Exp $ */
+/* $NetBSD: pmap.c,v 1.194 2011/02/10 06:42:17 macallan Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.193 2011/01/26 01:18:54 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.194 2011/02/10 06:42:17 macallan Exp $);
/*
* Manages physical address maps.
@@ -1192,14 +1192,13 @@
if (pa 0x8000) /* this is not error in general. */
panic(pmap_enter: pa);
#endif
+ if (flags PMAP_NOCACHE)
+ cached = 0;
#if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64)
- if (flags PMAP_NOCACHE) {
+ if (pa PGC_NOCACHE) {
cached = 0;
pa = ~PGC_NOCACHE;
- } else {
- cached = 1;
- pa |= PGC_NOCACHE;
}
#endif
CVS commit: src/gnu
Module Name:src
Committed By: matt
Date: Thu Feb 10 07:18:29 UTC 2011
Modified Files:
src/gnu/dist/gcc4/gcc: config.gcc
src/gnu/dist/gcc4/gcc/config/rs6000: netbsd.h
src/gnu/usr.bin/gcc4/arch/powerpc: tm.h
Log Message:
Default NetBSD to -msecure-plt now.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/gnu/dist/gcc4/gcc/config.gcc
cvs rdiff -u -r1.4 -r1.5 src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/gcc4/arch/powerpc/tm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gcc4/gcc/config.gcc
diff -u src/gnu/dist/gcc4/gcc/config.gcc:1.21 src/gnu/dist/gcc4/gcc/config.gcc:1.22
--- src/gnu/dist/gcc4/gcc/config.gcc:1.21 Sun Jan 23 06:29:52 2011
+++ src/gnu/dist/gcc4/gcc/config.gcc Thu Feb 10 07:18:29 2011
@@ -1704,6 +1704,9 @@
tmake_file=${tmake_file} rs6000/t-netbsd
;;
esac
+ if test x${enable_secureplt} != xno; then
+ tm_file=rs6000/secureplt.h ${tm_file}
+ fi
extra_options=${extra_options} rs6000/sysv4.opt rs6000/linux64.opt
;;
powerpc-*-chorusos*)
Index: src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h
diff -u src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h:1.4 src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h:1.5
--- src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h:1.4 Tue Jan 18 00:19:28 2011
+++ src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h Thu Feb 10 07:18:29 2011
@@ -44,6 +44,8 @@
builtin_define (__powerpc__); \
builtin_assert (cpu=powerpc); \
builtin_assert (machine=powerpc); \
+ if (TARGET_SECURE_PLT) \
+builtin_define (_SECURE_PLT); \
} \
while (0)
@@ -111,6 +113,7 @@
#undef SUBTARGET_EXTRA_SPECS
#define SUBTARGET_EXTRA_SPECS \
+ { cc1_secure_plt_default, CC1_SECURE_PLT_DEFAULT_SPEC }, \
{ netbsd_link_spec, NETBSD_LINK_SPEC_ELF }, \
{ netbsd_entry_point, NETBSD_ENTRY_POINT }, \
{ netbsd_endfile_spec, NETBSD_ENDFILE_SPEC },
Index: src/gnu/usr.bin/gcc4/arch/powerpc/tm.h
diff -u src/gnu/usr.bin/gcc4/arch/powerpc/tm.h:1.4 src/gnu/usr.bin/gcc4/arch/powerpc/tm.h:1.5
--- src/gnu/usr.bin/gcc4/arch/powerpc/tm.h:1.4 Mon Jul 3 00:24:46 2006
+++ src/gnu/usr.bin/gcc4/arch/powerpc/tm.h Thu Feb 10 07:18:29 2011
@@ -9,6 +9,7 @@
#endif
#ifdef IN_GCC
# include options.h
+# include config/rs6000/secureplt.h
# include config/rs6000/rs6000.h
# include config/dbxelf.h
# include config/elfos.h
CVS commit: src/sys/net
Module Name:src Committed By: kefren Date: Thu Feb 10 07:42:18 UTC 2011 Modified Files: src/sys/net: rtsock.c Log Message: Allow changing route flags. Should fix PR/40455 OK'ed: dyoung@ To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 src/sys/net/rtsock.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/net/rtsock.c diff -u src/sys/net/rtsock.c:1.133 src/sys/net/rtsock.c:1.134 --- src/sys/net/rtsock.c:1.133 Tue Feb 1 01:39:20 2011 +++ src/sys/net/rtsock.c Thu Feb 10 07:42:18 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rtsock.c,v 1.133 2011/02/01 01:39:20 matt Exp $ */ +/* $NetBSD: rtsock.c,v 1.134 2011/02/10 07:42:18 kefren Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rtsock.c,v 1.133 2011/02/01 01:39:20 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: rtsock.c,v 1.134 2011/02/10 07:42:18 kefren Exp $); #ifdef _KERNEL_OPT #include opt_inet.h @@ -139,6 +139,8 @@ .ri_maxqlen = IFQ_MAXLEN, }; +#define PRESERVED_RTF (RTF_UP | RTF_GATEWAY | RTF_HOST | RTF_DONE | RTF_MASK) + static void COMPATNAME(route_init)(void); static int COMPATNAME(route_output)(struct mbuf *, ...); static int COMPATNAME(route_usrreq)(struct socket *, @@ -473,6 +475,9 @@ if (ifp rt-rt_ifp != ifp) rt-rt_ifp = ifp; rt_setmetrics(rtm-rtm_inits, rtm, rt); + if (rt-rt_flags != info.rti_flags) +rt-rt_flags = (info.rti_flags ~PRESERVED_RTF) +| (rt-rt_flags PRESERVED_RTF); if (rt-rt_ifa rt-rt_ifa-ifa_rtrequest) rt-rt_ifa-ifa_rtrequest(RTM_ADD, rt, info); /*FALLTHROUGH*/
CVS commit: src/tests/net/route
Module Name:src Committed By: kefren Date: Thu Feb 10 07:47:50 UTC 2011 Modified Files: src/tests/net/route: t_change.sh Log Message: Problem was fixed, don't expect to fail anymore To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/net/route/t_change.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/net/route/t_change.sh diff -u src/tests/net/route/t_change.sh:1.1 src/tests/net/route/t_change.sh:1.2 --- src/tests/net/route/t_change.sh:1.1 Tue Feb 8 10:11:29 2011 +++ src/tests/net/route/t_change.sh Thu Feb 10 07:47:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: t_change.sh,v 1.1 2011/02/08 10:11:29 pooka Exp $ +# $NetBSD: t_change.sh,v 1.2 2011/02/10 07:47:50 kefren Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -47,7 +47,6 @@ rump.route -n show -inet | grep ^207.46 atf_check -s exit:0 -o ignore \ rump.route change 207.46.197.32 127.0.0.1 -blackhole - atf_expect_fail PR kern/40455 atf_check -s exit:0 -o match:' UGHBS ' -e ignore \ sh -c rump.netstat -rn -f inet | grep ^207.46| grep ^207.46 }
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: haad Date: Wed Feb 9 08:11:38 UTC 2011 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.sparc64 Log Message: Fix libdm breakage on 64bit platforms. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/base/md.sparc64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp300/hp300
Module Name:src Committed By: tsutsui Date: Wed Feb 9 09:29:57 UTC 2011 Modified Files: src/sys/arch/hp300/hp300: autoconf.c Log Message: Remove leftover debug stuff. To generate a diff of this commit: cvs rdiff -u -r1.94 -r1.95 src/sys/arch/hp300/hp300/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp300/hp300
Module Name:src Committed By: tsutsui Date: Wed Feb 9 09:32:50 UTC 2011 Modified Files: src/sys/arch/hp300/hp300: autoconf.c machdep.c Log Message: NHIL is no more. To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/arch/hp300/hp300/autoconf.c cvs rdiff -u -r1.217 -r1.218 src/sys/arch/hp300/hp300/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/resolv
Module Name:src Committed By: pooka Date: Wed Feb 9 09:46:59 UTC 2011 Modified Files: src/lib/libc/resolv: res_send.c Log Message: Don't do highestFD check with USE_POLL. It provides no benefit but causes a dependency between RLIMIT_NOFILE and rumphijack FDOFF. christos ok To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libc/resolv/res_send.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/usr.sbin/quotacheck
Module Name:src Committed By: bouyer Date: Wed Feb 9 09:51:17 UTC 2011 Modified Files: src/usr.sbin/quotacheck [bouyer-quota2]: quotacheck.c Log Message: Make it build in new world. Don't attempt to update in-kernel quota, but instead warn if quotas are already on. The rc.d script runs quotacheck before quotaon so this shouldn't be a problem. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.14.1 src/usr.sbin/quotacheck/quotacheck.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/usr.sbin/quotaon
Module Name:src Committed By: bouyer Date: Wed Feb 9 10:21:02 UTC 2011 Modified Files: src/usr.sbin/quotaon [bouyer-quota2]: Makefile quotaon.c Log Message: Make it compile with new quotactl To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.64.1 src/usr.sbin/quotaon/Makefile cvs rdiff -u -r1.23 -r1.23.2.1 src/usr.sbin/quotaon/quotaon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/usr.bin/quota
Module Name:src Committed By: bouyer Date: Wed Feb 9 10:21:36 UTC 2011 Modified Files: src/usr.bin/quota [bouyer-quota2]: getvfsquota.c Log Message: Use prop_array_add_and_rel() To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/usr.bin/quota/getvfsquota.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin
Module Name:src Committed By: rmind Date: Wed Feb 9 10:25:41 UTC 2011 Modified Files: src/usr.sbin/rbootd: rbootd.8 src/usr.sbin/vnconfig: vnconfig.8 Log Message: Restore historic SCCS IDs in the comments (were removed in previous commit). Noted by wiz@. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/rbootd/rbootd.8 cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/vnconfig/vnconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/sys/dev/stbi
Module Name:src Committed By: bouyer Date: Wed Feb 9 10:44:11 UTC 2011 Added Files: src/sys/dev/stbi [bouyer-quota2]: files.stbi stb_image.c stbi.h stbiconfig.h Log Message: Sync with HEAD To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.2 src/sys/dev/stbi/files.stbi \ src/sys/dev/stbi/stb_image.c src/sys/dev/stbi/stbi.h \ src/sys/dev/stbi/stbiconfig.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src
Module Name:src Committed By: bouyer Date: Wed Feb 9 10:51:03 UTC 2011 Modified Files: src/distrib/sets/lists/tests [bouyer-quota2]: mi src/etc/mtree [bouyer-quota2]: NetBSD.dist.tests Log Message: Add quota tests To generate a diff of this commit: cvs rdiff -u -r1.240.2.1 -r1.240.2.2 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.23.2.2 -r1.23.2.3 src/etc/mtree/NetBSD.dist.tests Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/sys/ufs/ffs
Module Name:src Committed By: bouyer Date: Wed Feb 9 10:52:08 UTC 2011 Modified Files: src/sys/ufs/ffs [bouyer-quota2]: ffs_subr.c Log Message: Make it build without FFS_EI To generate a diff of this commit: cvs rdiff -u -r1.45.28.3 -r1.45.28.4 src/sys/ufs/ffs/ffs_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/distrib/sets/lists/base
Module Name:src Committed By: bouyer Date: Wed Feb 9 10:55:13 UTC 2011 Modified Files: src/distrib/sets/lists/base [bouyer-quota2]: shl.mi Log Message: Sync with HEAD To generate a diff of this commit: cvs rdiff -u -r1.569.2.1 -r1.569.2.2 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/sys/arch/x86
Module Name:src Committed By: bouyer Date: Wed Feb 9 11:00:08 UTC 2011 Modified Files: src/sys/arch/x86/include [bouyer-quota2]: genfb_machdep.h src/sys/arch/x86/x86 [bouyer-quota2]: genfb_machdep.c Log Message: Sync with HEAD To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.14.1 src/sys/arch/x86/include/genfb_machdep.h cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/sys/arch/x86/x86/genfb_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/sys/ufs
Module Name:src Committed By: bouyer Date: Wed Feb 9 11:18:30 UTC 2011 Modified Files: src/sys/ufs [bouyer-quota2]: files.ufs src/sys/ufs/lfs [bouyer-quota2]: lfs_vfsops.c src/sys/ufs/ufs [bouyer-quota2]: quota.h quota1.h ufs_quota.c ufs_quota.h ufs_quota2.c Log Message: Various build fixes To generate a diff of this commit: cvs rdiff -u -r1.24.6.1 -r1.24.6.2 src/sys/ufs/files.ufs cvs rdiff -u -r1.287 -r1.287.4.1 src/sys/ufs/lfs/lfs_vfsops.c cvs rdiff -u -r1.25.64.2 -r1.25.64.3 src/sys/ufs/ufs/quota.h cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/ufs/ufs/quota1.h cvs rdiff -u -r1.68.4.9 -r1.68.4.10 src/sys/ufs/ufs/ufs_quota.c cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/ufs/ufs/ufs_quota.h cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/ufs/ufs/ufs_quota2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/raidctl
Module Name:src Committed By: pooka Date: Wed Feb 9 11:22:49 UTC 2011 Modified Files: src/sbin/raidctl: prog_ops.h raidctl.c raidctl_hostops.c raidctl_rumpops.c Log Message: Exterminate a bug I created in 2009. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sbin/raidctl/prog_ops.h \ src/sbin/raidctl/raidctl_hostops.c src/sbin/raidctl/raidctl_rumpops.c cvs rdiff -u -r1.50 -r1.51 src/sbin/raidctl/raidctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/sys/sys
Module Name:src Committed By: bouyer Date: Wed Feb 9 11:31:25 UTC 2011 Modified Files: src/sys/sys [bouyer-quota2]: quota.h Log Message: Kill duplicate definitions To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/sys/quota.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/sys/ufs/ufs
Module Name:src Committed By: bouyer Date: Wed Feb 9 11:37:17 UTC 2011 Modified Files: src/sys/ufs/ufs [bouyer-quota2]: ufs_vfsops.c Log Message: Fix build without quotas To generate a diff of this commit: cvs rdiff -u -r1.40.8.1 -r1.40.8.2 src/sys/ufs/ufs/ufs_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/ldpd
Module Name:src Committed By: kefren Date: Wed Feb 9 11:38:57 UTC 2011 Modified Files: src/usr.sbin/ldpd: mpls_interface.c mpls_routes.c Log Message: use RT_ROUNDUP provided by net/route.h To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/ldpd/mpls_interface.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/ldpd/mpls_routes.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/sys/ufs/ufs
Module Name:src Committed By: bouyer Date: Wed Feb 9 12:01:20 UTC 2011 Modified Files: src/sys/ufs/ufs [bouyer-quota2]: ufs_quota1.c Log Message: Fix typo To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/ufs/ufs/ufs_quota1.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jmcneill Date: Wed Feb 9 13:19:53 UTC 2011 Modified Files: src/sys/dev/pci: genfb_pci.c Log Message: switch genfb to polling mode at shutdown To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/genfb_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86
Module Name:src Committed By: jmcneill Date: Wed Feb 9 13:24:24 UTC 2011 Modified Files: src/sys/arch/x86/include: genfb_machdep.h src/sys/arch/x86/x86: genfb_machdep.c x86_autoconf.c Log Message: if genfb is attached, hook into db_trap_callback to switch in and out of polling mode as necessary To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/include/genfb_machdep.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/x86/genfb_machdep.c cvs rdiff -u -r1.54 -r1.55 src/sys/arch/x86/x86/x86_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server
Module Name:src Committed By: tsutsui Date: Wed Feb 9 13:37:48 UTC 2011 Modified Files: src/external/mit/xorg/server/drivers: Makefile src/external/mit/xorg/server/xorg-server: Makefile.common src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile Log Message: Add defintions for ews4800mips and hp300 Xorg servers. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/external/mit/xorg/server/drivers/Makefile cvs rdiff -u -r1.19 -r1.20 \ src/external/mit/xorg/server/xorg-server/Makefile.common cvs rdiff -u -r1.26 -r1.27 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: tsutsui Date: Wed Feb 9 13:41:00 UTC 2011 Modified Files: src/distrib/sets/lists/xserver: md.ews4800mips Added Files: src/distrib/sets/lists/xcomp: md.ews4800mips md.hp300 src/distrib/sets/lists/xserver: md.hp300 Log Message: Add lists for ews4800mips and hp300 Xorg servers. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/xcomp/md.ews4800mips cvs rdiff -u -r0 -r1.3 src/distrib/sets/lists/xcomp/md.hp300 cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/xserver/md.ews4800mips cvs rdiff -u -r0 -r1.9 src/distrib/sets/lists/xserver/md.hp300 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4/man4.hp300
Module Name:src Committed By: tsutsui Date: Wed Feb 9 14:13:09 UTC 2011 Modified Files: src/share/man/man4/man4.hp300: dvbox.4 gbox.4 hyper.4 rbox.4 topcat.4 Log Message: - update SYNOPSIS and SEE ALSO for wscons support - remove descriptions about obsolete ioctl To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.hp300/dvbox.4 \ src/share/man/man4/man4.hp300/gbox.4 src/share/man/man4/man4.hp300/rbox.4 \ src/share/man/man4/man4.hp300/topcat.4 cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.hp300/hyper.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumpclient
Module Name:src Committed By: pooka Date: Wed Feb 9 14:29:58 UTC 2011 Modified Files: src/lib/librumpclient: rumpclient.c Log Message: The following happens when sending mail with mutt via a rump TCP/IP stack: * mutt prepares to exec the smtp client: it forks and closes all file descriptors * when the next networking syscall is done, rumpclient detects that the communication fd returned EBADF and does a reconnect, gets descriptor 0 for the socket and descriptor 1 for kqueue * mutt opens the mail file and implicitly assumes it'll get 0-2, but in fact gets 2-4 * mutt execs the smtp agent which tries to read the mail from stdin (rumpclient communication socket) and fails Even if mutt correctly did dup2() things would go south when trying to communicate with the kernel server the next time, since rumpclient would actually be talking with some mail body instead (well, it could work, but in that case you'd need to write *really* weird mails ;). Hence, prevent rumpclient from using the special fd's 0-2 for its purposes. Should fix mutt problem reported by Alexander Nasonov. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/lib/librumpclient/rumpclient.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib
Module Name:src Committed By: pooka Date: Wed Feb 9 14:32:45 UTC 2011 Modified Files: src/tests/lib: Makefile Added Files: src/tests/lib/librumpclient: Makefile t_fd.c Log Message: Add test which checks rumpclient does not use fds 0-2 for its internal purposes. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/tests/lib/Makefile cvs rdiff -u -r0 -r1.1 src/tests/lib/librumpclient/Makefile \ src/tests/lib/librumpclient/t_fd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: pooka Date: Wed Feb 9 14:34:42 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests Log Message: more testies To generate a diff of this commit: cvs rdiff -u -r1.244 -r1.245 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.26 -r1.27 src/etc/mtree/NetBSD.dist.tests Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4/man4.hp300
Module Name:src Committed By: wiz Date: Wed Feb 9 14:37:56 UTC 2011 Modified Files: src/share/man/man4/man4.hp300: dvbox.4 gbox.4 hyper.4 rbox.4 topcat.4 Log Message: New sentence, new line. Sort SEE ALSO. Use Dq. Noun is setup. Fix a Dd. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/man4.hp300/dvbox.4 \ src/share/man/man4/man4.hp300/gbox.4 src/share/man/man4/man4.hp300/rbox.4 \ src/share/man/man4/man4.hp300/topcat.4 cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/man4.hp300/hyper.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: bouyer Date: Wed Feb 9 15:02:00 UTC 2011 Modified Files: src/sys/arch/x86/x86: x86_autoconf.c Log Message: Fix build when GENFB is not there. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/x86/x86/x86_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: tsutsui Date: Wed Feb 9 15:12:41 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4/man4.hp300: Makefile Added Files: src/share/man/man4: hil.4 hilid.4 hilkbd.4 hilms.4 Removed Files: src/share/man/man4/man4.hp300: grf.4 hil.4 ite.4 Log Message: - pull MI HIL device man pages from OpenBSD - remove obsolete hp300 ite, grf, and hil devices To generate a diff of this commit: cvs rdiff -u -r1.1285 -r1.1286 src/distrib/sets/lists/man/mi cvs rdiff -u -r0 -r1.1 src/share/man/man4/hil.4 src/share/man/man4/hilid.4 \ src/share/man/man4/hilkbd.4 src/share/man/man4/hilms.4 cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/man4.hp300/Makefile cvs rdiff -u -r1.9 -r0 src/share/man/man4/man4.hp300/grf.4 cvs rdiff -u -r1.11 -r0 src/share/man/man4/man4.hp300/hil.4 cvs rdiff -u -r1.8 -r0 src/share/man/man4/man4.hp300/ite.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: tsutsui Date: Wed Feb 9 15:31:30 UTC 2011 Modified Files: src/share/man/man4: Makefile Log Message: Don't forget to build and install MI HIL man pages. To generate a diff of this commit: cvs rdiff -u -r1.548 -r1.549 src/share/man/man4/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/sys/compat/netbsd32
Module Name:src Committed By: bouyer Date: Wed Feb 9 16:09:55 UTC 2011 Modified Files: src/sys/compat/netbsd32 [bouyer-quota2]: netbsd32_netbsd.c syscalls.master Log Message: Proper definitions for quotactl To generate a diff of this commit: cvs rdiff -u -r1.168.4.1 -r1.168.4.2 \ src/sys/compat/netbsd32/netbsd32_netbsd.c cvs rdiff -u -r1.84.6.1 -r1.84.6.2 src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/sys/compat/netbsd32
Module Name:src Committed By: bouyer Date: Wed Feb 9 16:10:19 UTC 2011 Modified Files: src/sys/compat/netbsd32 [bouyer-quota2]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_sysent.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.92.6.1 -r1.92.6.2 src/sys/compat/netbsd32/netbsd32_syscall.h \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.91.6.1 -r1.91.6.2 \ src/sys/compat/netbsd32/netbsd32_syscalls.c \ src/sys/compat/netbsd32/netbsd32_sysent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/sys/ufs
Module Name:src Committed By: bouyer Date: Wed Feb 9 16:15:01 UTC 2011 Modified Files: src/sys/ufs [bouyer-quota2]: files.ufs src/sys/ufs/ufs [bouyer-quota2]: ufs_quota.c ufs_quota.h ufs_quota1.c Log Message: Reimplement quotactl commands for quota1 To generate a diff of this commit: cvs rdiff -u -r1.24.6.2 -r1.24.6.3 src/sys/ufs/files.ufs cvs rdiff -u -r1.68.4.10 -r1.68.4.11 src/sys/ufs/ufs/ufs_quota.c cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/ufs/ufs/ufs_quota.h cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/ufs/ufs/ufs_quota1.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc
Module Name:othersrc Committed By: pooka Date: Wed Feb 9 16:38:16 UTC 2011 Modified Files: othersrc: Makefile.fsu Log Message: link in libs which are required these days To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 othersrc/Makefile.fsu Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/lib/libfsu_mount
Module Name:othersrc Committed By: pooka Date: Wed Feb 9 16:47:14 UTC 2011 Modified Files: othersrc/lib/libfsu_mount: fsu_mount.c Log Message: In case the gentle ukfs_release() fails, do it again mit KRAFT ... err, with FORCE. This decreases the chance the file system will be dirty after we plop with it. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 othersrc/lib/libfsu_mount/fsu_mount.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
