date:20110202

CVS commit: src/sys/arch/powerpc/powerpc

2011-02-02 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Wed Feb  2 09:02:40 UTC 2011

Modified Files:
src/sys/arch/powerpc/powerpc: vm_machdep.c

Log Message:
Always call cpu_lwp_bootstrap even in cpu_setfunc.  Let cpu_lwp_fork use
cpu_setfunc instead of duplicating code.  Simplify stack setup.
PR 44500


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/powerpc/powerpc/vm_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/powerpc/powerpc/vm_machdep.c
diff -u src/sys/arch/powerpc/powerpc/vm_machdep.c:1.81 src/sys/arch/powerpc/powerpc/vm_machdep.c:1.82
--- src/sys/arch/powerpc/powerpc/vm_machdep.c:1.81	Tue Jan 18 01:02:55 2011
+++ src/sys/arch/powerpc/powerpc/vm_machdep.c	Wed Feb  2 09:02:39 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.81 2011/01/18 01:02:55 matt Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.82 2011/02/02 09:02:39 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.81 2011/01/18 01:02:55 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.82 2011/02/02 09:02:39 matt Exp $);
 
 #include opt_altivec.h
 #include opt_multiprocessor.h
@@ -83,8 +83,6 @@
 cpu_lwp_fork(struct lwp *l1, struct lwp *l2, void *stack, size_t stacksize,
 	void (*func)(void *), void *arg)
 {
-	struct callframe *cf;
-	struct switchframe *sf;
 
 	/*
 	 * If l1 != curlwp  l1 == lwp0, we're creating a kernel thread.
@@ -123,6 +121,21 @@
 	}
 
 	/*
+	 * Now deal setting up the initial function and its argument.
+	 */
+	cpu_setfunc(l2, func, arg);
+}
+
+void
+cpu_setfunc(struct lwp *l, void (*func)(void *), void *arg)
+{
+	extern void setfunc_trampoline(void);
+	struct pcb * const pcb = lwp_getpcb(l);
+	struct ktrapframe * const ktf = ktrapframe(l);
+	struct callframe * const cf = ((struct callframe *)ktf) - 1;
+	struct switchframe * const sf = ((struct switchframe *)cf) - 1;
+
+	/*
 	 * Align stack pointer
 	 * struct ktrapframe has a partial callframe (sp  lr)
 	 * followed by a real trapframe.  The partial callframe
@@ -131,33 +144,24 @@
 	 * There happens to be a partial callframe in front of the
 	 * trapframe, too.
 	 */
-	struct ktrapframe * const ktf = ktrapframe(l2);
-	char *stktop2 = (void *)ktf;
-	ktf-ktf_sp = (register_t)(ktf + 1);		/* not used */
-	ktf-ktf_lr = (register_t)cpu_lwp_bootstrap;
+	ktf-ktf_lr = (register_t) cpu_lwp_bootstrap;
+	ktf-ktf_sp = (register_t) (ktf + 1);		/* just in case */
 
-	/*
-	 * Below the trap frame, there is another call frame:
-	 */
-	stktop2 -= CALLFRAMELEN;
-	cf = (struct callframe *)stktop2;
-	cf-cf_sp = (register_t)(stktop2 + CALLFRAMELEN);
-	cf-cf_r31 = (register_t)func;
-	cf-cf_r30 = (register_t)arg;
+	cf-cf_sp = (register_t) ktf;
+	cf-cf_r31 = (register_t) func;
+	cf-cf_r30 = (register_t) arg;
 
-	/*
-	 * Below that, we allocate the switch frame:
-	 */
-	stktop2 -= SFRAMELEN;		/* must match SFRAMELEN in genassym */
-	sf = (struct switchframe *)stktop2;
 	memset((void *)sf, 0, sizeof *sf);		/* just in case */
-	sf-sf_sp = (register_t)cf;
+	sf-sf_sp = (register_t) cf;
 #if defined (PPC_OEA) || defined (PPC_OEA64_BRIDGE)
 	sf-sf_user_sr = pmap_kernel()-pm_sr[USER_SR]; /* again, just in case */
 #endif
-	pcb2-pcb_sp = (register_t)stktop2;
-	pcb2-pcb_kmapsr = 0;
-	pcb2-pcb_umapsr = 0;
+	pcb-pcb_sp = (register_t)sf;
+	pcb-pcb_kmapsr = 0;
+	pcb-pcb_umapsr = 0;
+#ifdef PPC_HAVE_FPU
+	pcb-pcb_flags = PSL_FE_DFLT;
+#endif
 }
 
 void
@@ -289,33 +293,3 @@
 	bp-b_data = bp-b_saveaddr;
 	bp-b_saveaddr = 0;
 }
-
-void
-cpu_setfunc(struct lwp *l, void (*func)(void *), void *arg)
-{
-	extern void setfunc_trampoline(void);
-	struct pcb * const pcb = lwp_getpcb(l);
-	struct ktrapframe *ktf;
-	struct callframe *cf;
-	struct switchframe *sf;
-
-	ktf = ktrapframe(l);
-	KASSERT((ktf-ktf_tf.tf_srr1  PSL_USERSET) == PSL_USERSET);
-	ktf-ktf_lr = (register_t)setfunc_trampoline;
-	cf = ((struct callframe *) ktf) - 1;
-	cf-cf_sp = (register_t) ktf;
-	cf-cf_r31 = (register_t) func;
-	cf-cf_r30 = (register_t) arg;
-	sf = (struct switchframe *) ((uintptr_t) cf - SFRAMELEN);
-	memset((void *)sf, 0, sizeof *sf);		/* just in case */
-	sf-sf_sp = (register_t) cf;
-#if defined (PPC_OEA) || defined (PPC_OEA64_BRIDGE)
-	sf-sf_user_sr = pmap_kernel()-pm_sr[USER_SR]; /* again, just in case */
-#endif
-	pcb-pcb_sp = (register_t)sf;
-	pcb-pcb_kmapsr = 0;
-	pcb-pcb_umapsr = 0;
-#ifdef PPC_HAVE_FPU
-	pcb-pcb_flags = PSL_FE_DFLT;
-#endif
-}

CVS commit: src/lib/libnpf

2011-02-02 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Wed Feb  2 09:05:01 UTC 2011

Modified Files:
src/lib/libnpf: npf.3

Log Message:
New sentence, new line. Mark up NULL.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libnpf/npf.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libnpf/npf.3
diff -u src/lib/libnpf/npf.3:1.1 src/lib/libnpf/npf.3:1.2
--- src/lib/libnpf/npf.3:1.1	Wed Feb  2 02:20:25 2011
+++ src/lib/libnpf/npf.3	Wed Feb  2 09:05:01 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: npf.3,v 1.1 2011/02/02 02:20:25 rmind Exp $
+.\	$NetBSD: npf.3,v 1.2 2011/02/02 09:05:01 wiz Exp $
 .\
 .\ Copyright (c) 2011 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -110,16 +110,20 @@
 .Sh RULE INTERFACE
 .Bl -tag -width 4n
 .It Fn npf_rule_create
-Create a rule with a given name, attribute and priorty.  Name can be NULL,
-in which case rule has no unique identifier.  Otherwise, rules shall not
-have duplicate names.  The following attributes, which can be ORed, are
-available:
+Create a rule with a given name, attribute and priorty.
+Name can be
+.Dv NULL ,
+in which case rule has no unique identifier.
+Otherwise, rules shall not have duplicate names.
+The following attributes, which can be ORed, are available:
 .Bl -tag -width indent
 .It Dv NPF_RULE_PASS
-Decision of this rule is pass.  If this attribute is not
+Decision of this rule is pass.
+If this attribute is not
 specified, then packet block (drop) is the default.
 .It Dv NPF_RULE_DEFAULT
-This a default rule in the ruleset.  There can only be a
+This a default rule in the ruleset.
+There can only be a
 single rule having this attribute set in the ruleset.
 .It Dv NPF_RULE_FINAL
 Indicates that on rule match, further processing of the
@@ -163,12 +167,14 @@
 .Fa parent .
 If value of
 .Fa parent
-is NULL,
+is
+.Dv NULL ,
 then insert into the main ruleset.
 .Pp
-Priority is the order of the rule in the ruleset.  Lower value means first
-to process, higher value - last to process.  If multiple rules have the same
-priority - order is unspecified.  A special constant
+Priority is the order of the rule in the ruleset.
+Lower value means first to process, higher value - last to process.
+If multiple rules have the same priority - order is unspecified.
+A special constant
 .Dv NPF_PRI_NEXT
 may be passed to use the value of last used priority incremented by 1.
 .It npf_rule_setproc
@@ -220,7 +226,7 @@
 Translation address is specified by
 .Fa addr ,
 and its family by
-.Fa fa.
+.Fa fa .
 Family must be either
 .Dv AF_INET
 for IPv4 or
@@ -286,5 +292,5 @@
 .Xr npfctl 8 ,
 .Xr npf_ncode 9
 .Sh HISTORY
-NPF library first appeared in
+The NPF library first appeared in
 .Nx 6.0 .

CVS commit: src/share/man/man7

2011-02-02 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Wed Feb  2 09:07:33 UTC 2011

Modified Files:
src/share/man/man7: sysctl.7

Log Message:
Remove trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/share/man/man7/sysctl.7

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/man7/sysctl.7
diff -u src/share/man/man7/sysctl.7:1.60 src/share/man/man7/sysctl.7:1.61
--- src/share/man/man7/sysctl.7:1.60	Tue Feb  1 21:03:53 2011
+++ src/share/man/man7/sysctl.7	Wed Feb  2 09:07:32 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: sysctl.7,v 1.60 2011/02/01 21:03:53 christos Exp $
+.\	$NetBSD: sysctl.7,v 1.61 2011/02/02 09:07:32 wiz Exp $
 .\
 .\ Copyright (c) 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -142,7 +142,7 @@
 Returns configuration information about the file system type given as a fourth
 level identifier.
 .It Li vfs.generic.usermount ( VFS_USERMOUNT )
-Determines if non superuser mounts are allowed, default to no 
+Determines if non superuser mounts are allowed, default to no
 .Dv 0 .
 .It Li vfs.generic.magiclinks ( VFS_MAGICLINKS )
 Controls if expansion of variables is going to be performed on pathnames

CVS commit: src/sys/arch/x86

2011-02-02 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Wed Feb  2 12:26:43 UTC 2011

Modified Files:
src/sys/arch/x86/include: cpu_counter.h
src/sys/arch/x86/x86: cpu.c tsc.c

Log Message:
Some CPU have cpu counter (CPUID_TSC is there) but don't handle the
rdmsr instruction (CPUID_MSR is not there).
Introduce a cpu_counter_serializing() function to remplace rdmsr(MSR_TSC)
calls, which does a rdmsr(MSR_TSC) if available and cpu_counter() otherwise.
This makes the cpu counter useable on vortex86 CPUs.
OK ad@


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/include/cpu_counter.h
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x86/x86/tsc.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/cpu_counter.h
diff -u src/sys/arch/x86/include/cpu_counter.h:1.4 src/sys/arch/x86/include/cpu_counter.h:1.5
--- src/sys/arch/x86/include/cpu_counter.h:1.4	Sat May 10 16:12:32 2008
+++ src/sys/arch/x86/include/cpu_counter.h	Wed Feb  2 12:26:42 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_counter.h,v 1.4 2008/05/10 16:12:32 ad Exp $	*/
+/*	$NetBSD: cpu_counter.h,v 1.5 2011/02/02 12:26:42 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -35,6 +35,7 @@
 #ifdef _KERNEL
 
 uint64_t	cpu_counter(void);
+uint64_t	cpu_counter_serializing(void);
 uint32_t	cpu_counter32(void);
 uint64_t	cpu_frequency(struct cpu_info *);
 int		cpu_hascounter(void);

Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.79 src/sys/arch/x86/x86/cpu.c:1.80
--- src/sys/arch/x86/x86/cpu.c:1.79	Tue Jan 11 18:25:25 2011
+++ src/sys/arch/x86/x86/cpu.c	Wed Feb  2 12:26:42 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.79 2011/01/11 18:25:25 jruoho Exp $	*/
+/*	$NetBSD: cpu.c,v 1.80 2011/02/02 12:26:42 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.79 2011/01/11 18:25:25 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.80 2011/02/02 12:26:42 bouyer Exp $);
 
 #include opt_ddb.h
 #include opt_mpbios.h		/* for MPDEBUG */
@@ -1080,9 +1080,10 @@
 	uint64_t last_tsc;
 
 	if (cpu_hascounter()) {
-		last_tsc = rdmsr(MSR_TSC);
+		last_tsc = cpu_counter_serializing();
 		i8254_delay(10);
-		ci-ci_data.cpu_cc_freq = (rdmsr(MSR_TSC) - last_tsc) * 10;
+		ci-ci_data.cpu_cc_freq =
+		(cpu_counter_serializing() - last_tsc) * 10;
 	}
 }
 

Index: src/sys/arch/x86/x86/tsc.c
diff -u src/sys/arch/x86/x86/tsc.c:1.27 src/sys/arch/x86/x86/tsc.c:1.28
--- src/sys/arch/x86/x86/tsc.c:1.27	Sat Aug 21 01:57:34 2010
+++ src/sys/arch/x86/x86/tsc.c	Wed Feb  2 12:26:42 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: tsc.c,v 1.27 2010/08/21 01:57:34 jruoho Exp $	*/
+/*	$NetBSD: tsc.c,v 1.28 2011/02/02 12:26:42 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tsc.c,v 1.27 2010/08/21 01:57:34 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: tsc.c,v 1.28 2011/02/02 12:26:42 bouyer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -177,13 +177,13 @@
 
 	/* Flag it and read our TSC. */
 	atomic_or_uint(ci-ci_flags, CPUF_SYNCTSC);
-	bptsc = rdmsr(MSR_TSC)  1;
+	bptsc = cpu_counter_serializing()  1;
 
 	/* Wait for remote to complete, and read ours again. */
 	while ((ci-ci_flags  CPUF_SYNCTSC) != 0) {
 		__insn_barrier();
 	}
-	bptsc += (rdmsr(MSR_TSC)  1);
+	bptsc += (cpu_counter_serializing()  1);
 
 	/* Wait for the results to come in. */
 	while (tsc_sync_cpu == ci) {
@@ -222,11 +222,11 @@
 	while ((ci-ci_flags  CPUF_SYNCTSC) == 0) {
 		__insn_barrier();
 	}
-	tsc = (rdmsr(MSR_TSC)  1);
+	tsc = (cpu_counter_serializing()  1);
 
 	/* Instruct primary to read its counter. */
 	atomic_and_uint(ci-ci_flags, ~CPUF_SYNCTSC);
-	tsc += (rdmsr(MSR_TSC)  1);
+	tsc += (cpu_counter_serializing()  1);
 
 	/* Post result.  Ensure the whole value goes out atomically. */
 	(void)atomic_swap_64(tsc_sync_val, tsc);
@@ -257,3 +257,12 @@
 
 	return cpu_feature[0]  CPUID_TSC;
 }
+
+uint64_t
+cpu_counter_serializing(void)
+{
+	if (cpu_feature[0]  CPUID_MSR)
+		return rdmsr(MSR_TSC);
+	else
+		return cpu_counter();
+}

CVS commit: src/sys/rump/librump/rumpvfs

2011-02-02 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Wed Feb  2 14:41:56 UTC 2011

Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c

Log Message:
adjust inode size too if VOP_SETATTR changes size


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/rump/librump/rumpvfs/rumpfs.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/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.89 src/sys/rump/librump/rumpvfs/rumpfs.c:1.90
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.89	Fri Jan 14 11:07:42 2011
+++ src/sys/rump/librump/rumpvfs/rumpfs.c	Wed Feb  2 14:41:55 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpfs.c,v 1.89 2011/01/14 11:07:42 pooka Exp $	*/
+/*	$NetBSD: rumpfs.c,v 1.90 2011/02/02 14:41:55 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009, 2010 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.89 2011/01/14 11:07:42 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.90 2011/02/02 14:41:55 pooka Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -855,8 +855,24 @@
 	SETIFVAL(va_flags, u_long);
 #undef  SETIFVAL
 
-	if (vp-v_type == VREG  vap-va_size != VSIZENOTSET)
-		uvm_vnp_setsize(vp, vap-va_size);
+	if (vp-v_type == VREG 
+	vap-va_size != VSIZENOTSET 
+	vap-va_size != rn-rn_dlen) {
+		void *newdata;
+		size_t copylen, newlen;
+
+		newlen = vap-va_size;
+		newdata = rump_hypermalloc(newlen, 0, true, rumpfs);
+
+		copylen = MIN(rn-rn_dlen, newlen);
+		memset(newdata, 0, newlen);
+		memcpy(newdata, rn-rn_data, copylen);
+		rump_hyperfree(rn-rn_data, rn-rn_dlen); 
+
+		rn-rn_data = newdata;
+		rn-rn_dlen = newlen;
+		uvm_vnp_setsize(vp, newlen);
+	}
 	return 0;
 }

CVS commit: src/tests/fs/vfs

2011-02-02 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Wed Feb  2 14:42:15 UTC 2011

Modified Files:
src/tests/fs/vfs: t_io.c

Log Message:
add a few overwrite-related tests


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/vfs/t_io.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/fs/vfs/t_io.c
diff -u src/tests/fs/vfs/t_io.c:1.6 src/tests/fs/vfs/t_io.c:1.7
--- src/tests/fs/vfs/t_io.c:1.6	Mon Jan  3 09:35:33 2011
+++ src/tests/fs/vfs/t_io.c	Wed Feb  2 14:42:15 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_io.c,v 1.6 2011/01/03 09:35:33 pooka Exp $	*/
+/*	$NetBSD: t_io.c,v 1.7 2011/02/02 14:42:15 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -117,10 +117,54 @@
 	extendbody(tc, 37);
 }
 
+static void
+overwritebody(const atf_tc_t *tc, off_t count, bool dotrunc)
+{
+	char *buf;
+	int fd;
+
+	REQUIRE_LIBC(buf = malloc(count), NULL);
+	FSTEST_ENTER();
+	RL(fd = rump_sys_open(testi, O_CREAT | O_RDWR));
+	ATF_REQUIRE_EQ(rump_sys_write(fd, buf, count), count);
+	RL(rump_sys_close(fd));
+
+	RL(fd = rump_sys_open(testi, O_CREAT | O_RDWR));
+	if (dotrunc)
+		RL(rump_sys_ftruncate(fd, 0));
+	ATF_REQUIRE_EQ(rump_sys_write(fd, buf, count), count);
+	RL(rump_sys_close(fd));
+	FSTEST_EXIT();
+}
+
+static void
+overwrite512(const atf_tc_t *tc, const char *mp)
+{
+
+	overwritebody(tc, 512, false);
+}
+
+static void
+overwrite64k(const atf_tc_t *tc, const char *mp)
+{
+
+	overwritebody(tc, 116, false);
+}
+
+static void
+overwrite_trunc(const atf_tc_t *tc, const char *mp)
+{
+
+	overwritebody(tc, 116, true);
+}
+
 ATF_TC_FSAPPLY(holywrite, create a sparse file and fill hole);
 ATF_TC_FSAPPLY(extendfile, check that extending a file works);
 ATF_TC_FSAPPLY(extendfile_append, check that extending a file works 
   with a append-only fd);
+ATF_TC_FSAPPLY(overwrite512, write a 512 byte file twice);
+ATF_TC_FSAPPLY(overwrite64k, write a 64k byte file twice);
+ATF_TC_FSAPPLY(overwrite_trunc, write 64k + truncate + rewrite);
 
 ATF_TP_ADD_TCS(tp)
 {
@@ -128,6 +172,9 @@
 	ATF_TP_FSAPPLY(holywrite);
 	ATF_TP_FSAPPLY(extendfile);
 	ATF_TP_FSAPPLY(extendfile_append);
+	ATF_TP_FSAPPLY(overwrite512);
+	ATF_TP_FSAPPLY(overwrite64k);
+	ATF_TP_FSAPPLY(overwrite_trunc);
 
 	return atf_no_error();
 }

CVS commit: src/sys/uvm

2011-02-02 Thread Chuck Cranor

Module Name:src
Committed By:   chuck
Date:   Wed Feb  2 15:13:34 UTC 2011

Modified Files:
src/sys/uvm: uvm.h uvm_amap.c uvm_amap.h uvm_anon.c uvm_anon.h
uvm_ddb.h uvm_device.c uvm_device.h uvm_extern.h uvm_fault.c
uvm_fault.h uvm_fault_i.h uvm_glue.h uvm_init.c uvm_io.c uvm_km.h
uvm_loan.c uvm_loan.h uvm_object.h uvm_pager.c uvm_pager.h
uvm_stat.c uvm_stat.h uvm_user.c

Log Message:
udpate license clauses on my code to match the new-style BSD licenses.
based on diff that rmind@ sent me.

no functional change with this commit.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/uvm/uvm.h
cvs rdiff -u -r1.88 -r1.89 src/sys/uvm/uvm_amap.c
cvs rdiff -u -r1.34 -r1.35 src/sys/uvm/uvm_amap.h
cvs rdiff -u -r1.51 -r1.52 src/sys/uvm/uvm_anon.c
cvs rdiff -u -r1.26 -r1.27 src/sys/uvm/uvm_anon.h
cvs rdiff -u -r1.13 -r1.14 src/sys/uvm/uvm_ddb.h src/sys/uvm/uvm_user.c
cvs rdiff -u -r1.57 -r1.58 src/sys/uvm/uvm_device.c
cvs rdiff -u -r1.11 -r1.12 src/sys/uvm/uvm_device.h
cvs rdiff -u -r1.168 -r1.169 src/sys/uvm/uvm_extern.h
cvs rdiff -u -r1.180 -r1.181 src/sys/uvm/uvm_fault.c
cvs rdiff -u -r1.19 -r1.20 src/sys/uvm/uvm_fault.h
cvs rdiff -u -r1.25 -r1.26 src/sys/uvm/uvm_fault_i.h
cvs rdiff -u -r1.9 -r1.10 src/sys/uvm/uvm_glue.h
cvs rdiff -u -r1.38 -r1.39 src/sys/uvm/uvm_init.c
cvs rdiff -u -r1.24 -r1.25 src/sys/uvm/uvm_io.c
cvs rdiff -u -r1.18 -r1.19 src/sys/uvm/uvm_km.h
cvs rdiff -u -r1.77 -r1.78 src/sys/uvm/uvm_loan.c
cvs rdiff -u -r1.16 -r1.17 src/sys/uvm/uvm_loan.h
cvs rdiff -u -r1.29 -r1.30 src/sys/uvm/uvm_object.h
cvs rdiff -u -r1.98 -r1.99 src/sys/uvm/uvm_pager.c
cvs rdiff -u -r1.39 -r1.40 src/sys/uvm/uvm_pager.h
cvs rdiff -u -r1.35 -r1.36 src/sys/uvm/uvm_stat.c
cvs rdiff -u -r1.47 -r1.48 src/sys/uvm/uvm_stat.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/uvm/uvm.h
diff -u src/sys/uvm/uvm.h:1.59 src/sys/uvm/uvm.h:1.60
--- src/sys/uvm/uvm.h:1.59	Thu Dec  9 01:48:05 2010
+++ src/sys/uvm/uvm.h	Wed Feb  2 15:13:33 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm.h,v 1.59 2010/12/09 01:48:05 uebayasi Exp $	*/
+/*	$NetBSD: uvm.h,v 1.60 2011/02/02 15:13:33 chuck Exp $	*/
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -27,7 +27,6 @@
  */
 
 /*
- *
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * All rights reserved.
  *
@@ -39,12 +38,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Charles D. Cranor and
- *  Washington University.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/uvm/uvm_amap.c
diff -u src/sys/uvm/uvm_amap.c:1.88 src/sys/uvm/uvm_amap.c:1.89
--- src/sys/uvm/uvm_amap.c:1.88	Wed Oct 21 21:12:07 2009
+++ src/sys/uvm/uvm_amap.c	Wed Feb  2 15:13:33 2011
@@ -1,7 +1,6 @@
-/*	$NetBSD: uvm_amap.c,v 1.88 2009/10/21 21:12:07 rmind Exp $	*/
+/*	$NetBSD: uvm_amap.c,v 1.89 2011/02/02 15:13:33 chuck Exp $	*/
 
 /*
- *
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * All rights reserved.
  *
@@ -13,12 +12,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Charles D. Cranor and
- *  Washington University.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -42,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_amap.c,v 1.88 2009/10/21 21:12:07 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_amap.c,v 1.89 2011/02/02 15:13:33 chuck Exp $);
 
 #include opt_uvmhist.h
 

Index: src/sys/uvm/uvm_amap.h
diff -u src/sys/uvm/uvm_amap.h:1.34 src/sys/uvm/uvm_amap.h:1.35
--- src/sys/uvm/uvm_amap.h:1.34	Sun Oct 26 08:32:02 2008
+++ src/sys/uvm/uvm_amap.h	Wed Feb  2 15:13:33 2011
@@ -1,7 +1,6 @@
-/*	$NetBSD: uvm_amap.h,v 1.34 2008/10/26 08:32:02 bjs

CVS commit: src/lib/libnpf

2011-02-02 Thread Mindaugas Rasiukevicius

Module Name:src
Committed By:   rmind
Date:   Wed Feb  2 15:17:38 UTC 2011

Modified Files:
src/lib/libnpf: npf.c

Log Message:
npf_nat_create: fix attributes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libnpf/npf.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/libnpf/npf.c
diff -u src/lib/libnpf/npf.c:1.1 src/lib/libnpf/npf.c:1.2
--- src/lib/libnpf/npf.c:1.1	Wed Feb  2 02:20:25 2011
+++ src/lib/libnpf/npf.c	Wed Feb  2 15:17:37 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf.c,v 1.1 2011/02/02 02:20:25 rmind Exp $	*/
+/*	$NetBSD: npf.c,v 1.2 2011/02/02 15:17:37 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2010-2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf.c,v 1.1 2011/02/02 02:20:25 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf.c,v 1.2 2011/02/02 15:17:37 rmind Exp $);
 
 #include sys/types.h
 #include netinet/in_systm.h
@@ -285,15 +285,15 @@
 _npf_rproc_setnorm(nl_rproc_t *rp, bool rnd, bool no_df, int minttl, int maxmss)
 {
 	prop_dictionary_t rpdict = rp-nrp_dict;
-	uint32_t attr;
+	uint32_t fl;
 
 	prop_dictionary_set_bool(rpdict, randomize-id, rnd);
 	prop_dictionary_set_bool(rpdict, no-df, no_df);
 	prop_dictionary_set_uint32(rpdict, min-ttl, minttl);
 	prop_dictionary_set_uint32(rpdict, max-mss, maxmss);
 
-	prop_dictionary_get_uint32(rpdict, flags, attr);
-	prop_dictionary_set_uint32(rpdict, flags, attr | NPF_RPROC_NORMALIZE);
+	prop_dictionary_get_uint32(rpdict, flags, fl);
+	prop_dictionary_set_uint32(rpdict, flags, fl | NPF_RPROC_NORMALIZE);
 	return 0;
 }
 
@@ -301,12 +301,12 @@
 _npf_rproc_setlog(nl_rproc_t *rp, u_int if_idx)
 {
 	prop_dictionary_t rpdict = rp-nrp_dict;
-	uint32_t attr;
+	uint32_t fl;
 
 	prop_dictionary_set_uint32(rpdict, log-interface, if_idx);
 
-	prop_dictionary_get_uint32(rpdict, flags, attr);
-	prop_dictionary_set_uint32(rpdict, flags, attr | NPF_RPROC_LOG);
+	prop_dictionary_get_uint32(rpdict, flags, fl);
+	prop_dictionary_set_uint32(rpdict, flags, fl | NPF_RPROC_LOG);
 	return 0;
 }
 
@@ -349,7 +349,7 @@
 	}
 
 	attr = NPF_RULE_PASS | NPF_RULE_FINAL |
-	(type == NPF_NATOUT) ? NPF_RULE_OUT : NPF_RULE_IN;
+	(type == NPF_NATOUT ? NPF_RULE_OUT : NPF_RULE_IN);
 
 	/* Create a rule for NAT policy.  Next, will add translation data. */
 	rl = npf_rule_create(NULL, attr, if_idx);

CVS commit: src/sys/uvm

2011-02-02 Thread Chuck Cranor

Module Name:src
Committed By:   chuck
Date:   Wed Feb  2 15:25:28 UTC 2011

Modified Files:
src/sys/uvm: uvm_coredump.c uvm_glue.c uvm_km.c uvm_map.c uvm_map.h
uvm_meter.c uvm_page.c uvm_page.h uvm_pdaemon.c uvm_pdaemon.h
uvm_pdpolicy_clock.c

Log Message:
udpate license clauses on my code to match the new-style BSD licenses.
based on second diff that rmind@ sent me.

no functional change with this commit.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/uvm/uvm_coredump.c
cvs rdiff -u -r1.146 -r1.147 src/sys/uvm/uvm_glue.c
cvs rdiff -u -r1.107 -r1.108 src/sys/uvm/uvm_km.c
cvs rdiff -u -r1.294 -r1.295 src/sys/uvm/uvm_map.c
cvs rdiff -u -r1.65 -r1.66 src/sys/uvm/uvm_map.h
cvs rdiff -u -r1.55 -r1.56 src/sys/uvm/uvm_meter.c
cvs rdiff -u -r1.169 -r1.170 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.70 -r1.71 src/sys/uvm/uvm_page.h
cvs rdiff -u -r1.101 -r1.102 src/sys/uvm/uvm_pdaemon.c
cvs rdiff -u -r1.16 -r1.17 src/sys/uvm/uvm_pdaemon.h
cvs rdiff -u -r1.12 -r1.13 src/sys/uvm/uvm_pdpolicy_clock.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/uvm/uvm_coredump.c
diff -u src/sys/uvm/uvm_coredump.c:1.1 src/sys/uvm/uvm_coredump.c:1.2
--- src/sys/uvm/uvm_coredump.c:1.1	Wed Nov 19 18:36:10 2008
+++ src/sys/uvm/uvm_coredump.c	Wed Feb  2 15:25:27 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_coredump.c,v 1.1 2008/11/19 18:36:10 ad Exp $	*/
+/*	$NetBSD: uvm_coredump.c,v 1.2 2011/02/02 15:25:27 chuck Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -17,12 +17,7 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed by Charles D. Cranor,
- *  Washington University, the University of California, Berkeley and
- *  its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *may be used to endorse or promote products derived from this software
  *without specific prior written permission.
  *
@@ -67,7 +62,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_coredump.c,v 1.1 2008/11/19 18:36:10 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_coredump.c,v 1.2 2011/02/02 15:25:27 chuck Exp $);
 
 /*
  * uvm_coredump.c: glue functions for coredump

Index: src/sys/uvm/uvm_glue.c
diff -u src/sys/uvm/uvm_glue.c:1.146 src/sys/uvm/uvm_glue.c:1.147
--- src/sys/uvm/uvm_glue.c:1.146	Fri Jan 14 02:06:34 2011
+++ src/sys/uvm/uvm_glue.c	Wed Feb  2 15:25:27 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_glue.c,v 1.146 2011/01/14 02:06:34 rmind Exp $	*/
+/*	$NetBSD: uvm_glue.c,v 1.147 2011/02/02 15:25:27 chuck Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -17,12 +17,7 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed by Charles D. Cranor,
- *  Washington University, the University of California, Berkeley and
- *  its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *may be used to endorse or promote products derived from this software
  *without specific prior written permission.
  *
@@ -67,7 +62,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_glue.c,v 1.146 2011/01/14 02:06:34 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_glue.c,v 1.147 2011/02/02 15:25:27 chuck Exp $);
 
 #include opt_kgdb.h
 #include opt_kstack.h

Index: src/sys/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.107 src/sys/uvm/uvm_km.c:1.108
--- src/sys/uvm/uvm_km.c:1.107	Tue Jan  4 08:26:33 2011
+++ src/sys/uvm/uvm_km.c	Wed Feb  2 15:25:27 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_km.c,v 1.107 2011/01/04 08:26:33 matt Exp $	*/
+/*	$NetBSD: uvm_km.c,v 1.108 2011/02/02 15:25:27 chuck Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -17,12 +17,7 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the

CVS commit: src/sys/uvm

2011-02-02 Thread Chuck Cranor

Module Name:src
Committed By:   chuck
Date:   Wed Feb  2 15:28:38 UTC 2011

Modified Files:
src/sys/uvm: uvm_aobj.c uvm_aobj.h

Log Message:
udpate license clauses on chuck^2 code to match the new-style BSD licenses.
based on diff that rmind@ sent me (and confirmed with chs@ via email).

no functional change with this commit.


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/uvm/uvm_aobj.c
cvs rdiff -u -r1.20 -r1.21 src/sys/uvm/uvm_aobj.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/uvm/uvm_aobj.c
diff -u src/sys/uvm/uvm_aobj.c:1.111 src/sys/uvm/uvm_aobj.c:1.112
--- src/sys/uvm/uvm_aobj.c:1.111	Tue Jan 25 03:34:29 2011
+++ src/sys/uvm/uvm_aobj.c	Wed Feb  2 15:28:38 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_aobj.c,v 1.111 2011/01/25 03:34:29 enami Exp $	*/
+/*	$NetBSD: uvm_aobj.c,v 1.112 2011/02/02 15:28:38 chuck Exp $	*/
 
 /*
  * Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@@ -13,12 +13,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Charles D. Cranor and
- *  Washington University.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -43,7 +37,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_aobj.c,v 1.111 2011/01/25 03:34:29 enami Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_aobj.c,v 1.112 2011/02/02 15:28:38 chuck Exp $);
 
 #include opt_uvmhist.h
 

Index: src/sys/uvm/uvm_aobj.h
diff -u src/sys/uvm/uvm_aobj.h:1.20 src/sys/uvm/uvm_aobj.h:1.21
--- src/sys/uvm/uvm_aobj.h:1.20	Sat Dec  1 10:40:03 2007
+++ src/sys/uvm/uvm_aobj.h	Wed Feb  2 15:28:38 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_aobj.h,v 1.20 2007/12/01 10:40:03 yamt Exp $	*/
+/*	$NetBSD: uvm_aobj.h,v 1.21 2011/02/02 15:28:38 chuck Exp $	*/
 
 /*
  * Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@@ -13,12 +13,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Charles D. Cranor and
- *  Washington University.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

CVS commit: src/sys/rump/librump/rumpvfs

2011-02-02 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Wed Feb  2 15:55:22 UTC 2011

Modified Files:
src/sys/rump/librump/rumpvfs: rumpblk.c

Log Message:
never open rumpblk backend with O_TRUNC
XXX: the rumpuser_open interface needs a beating


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/rump/librump/rumpvfs/rumpblk.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/rump/librump/rumpvfs/rumpblk.c
diff -u src/sys/rump/librump/rumpvfs/rumpblk.c:1.42 src/sys/rump/librump/rumpvfs/rumpblk.c:1.43
--- src/sys/rump/librump/rumpvfs/rumpblk.c:1.42	Mon Sep  6 18:03:57 2010
+++ src/sys/rump/librump/rumpvfs/rumpblk.c	Wed Feb  2 15:55:22 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpblk.c,v 1.42 2010/09/06 18:03:57 pooka Exp $	*/
+/*	$NetBSD: rumpblk.c,v 1.43 2011/02/02 15:55:22 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -52,7 +52,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpblk.c,v 1.42 2010/09/06 18:03:57 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpblk.c,v 1.43 2011/02/02 15:55:22 pooka Exp $);
 
 #include sys/param.h
 #include sys/buf.h
@@ -488,6 +488,7 @@
 
 	if (rblk-rblk_fd != -1)
 		return 0; /* XXX: refcount, open mode */
+	flag = ~O_TRUNC;
 	fd = rumpuser_open(rblk-rblk_path, OFLAGS(flag), error);
 	if (error)
 		return error;

CVS commit: src/sys/rump/librump/rumpvfs

2011-02-02 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Wed Feb  2 15:58:09 UTC 2011

Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c

Log Message:
Allow etfs for CREATE lookups too.  This takes care of O_CREAT calls
to open(), which act just like lookups if the node exists (found
from etfs).  If the node doesn't exist in etfs, nothing changes
from the previous situation.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/rump/librump/rumpvfs/rumpfs.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/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.90 src/sys/rump/librump/rumpvfs/rumpfs.c:1.91
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.90	Wed Feb  2 14:41:55 2011
+++ src/sys/rump/librump/rumpvfs/rumpfs.c	Wed Feb  2 15:58:09 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpfs.c,v 1.90 2011/02/02 14:41:55 pooka Exp $	*/
+/*	$NetBSD: rumpfs.c,v 1.91 2011/02/02 15:58:09 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009, 2010 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.90 2011/02/02 14:41:55 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.91 2011/02/02 15:58:09 pooka Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -679,7 +679,8 @@
 		return EOPNOTSUPP;
 
 	/* check for etfs */
-	if (dvp == rootvnode  cnp-cn_nameiop == LOOKUP) {
+	if (dvp == rootvnode 
+	(cnp-cn_nameiop == LOOKUP || cnp-cn_nameiop == CREATE)) {
 		bool found;
 		mutex_enter(etfs_lock);
 		found = etfs_find(cnp-cn_nameptr, et, false);

CVS commit: src/common/lib/libprop

2011-02-02 Thread Iain Hibbert

Module Name:src
Committed By:   plunky
Date:   Wed Feb  2 16:37:27 UTC 2011

Modified Files:
src/common/lib/libprop: prop_dictionary.3

Log Message:
prop_dictionary_internalize_from_file_returns_a_dictionary_not_an_array


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/common/lib/libprop/prop_dictionary.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/common/lib/libprop/prop_dictionary.3
diff -u src/common/lib/libprop/prop_dictionary.3:1.15 src/common/lib/libprop/prop_dictionary.3:1.16
--- src/common/lib/libprop/prop_dictionary.3:1.15	Sat Dec  5 10:17:17 2009
+++ src/common/lib/libprop/prop_dictionary.3	Wed Feb  2 16:37:27 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: prop_dictionary.3,v 1.15 2009/12/05 10:17:17 wiz Exp $
+.\	$NetBSD: prop_dictionary.3,v 1.16 2011/02/02 16:37:27 plunky Exp $
 .\
 .\ Copyright (c) 2006, 2009 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -313,7 +313,7 @@
 .It Fn prop_dictionary_internalize_from_file const char *path
 Reads the XML property list contained in the file specified by
 .Fa path ,
-internalizes it, and returns the corresponding array.
+internalizes it, and returns the corresponding dictionary.
 Returns
 .Dv NULL
 on failure.

CVS commit: src/sys

2011-02-02 Thread Chuck Cranor

Module Name:src
Committed By:   chuck
Date:   Wed Feb  2 17:53:42 UTC 2011

Modified Files:
src/sys/arch/mvme68k/stand/sboot: console.c etherfun.c etherfun.h
sboot.c sboot.h
src/sys/uvm: uvm.h uvm_page.c

Log Message:
udpate license clauses on my code to match the new-style BSD licenses.
based on diff that rmind@ sent me.

no functional change with this commit.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mvme68k/stand/sboot/console.c \
src/sys/arch/mvme68k/stand/sboot/sboot.c \
src/sys/arch/mvme68k/stand/sboot/sboot.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mvme68k/stand/sboot/etherfun.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mvme68k/stand/sboot/etherfun.h
cvs rdiff -u -r1.60 -r1.61 src/sys/uvm/uvm.h
cvs rdiff -u -r1.170 -r1.171 src/sys/uvm/uvm_page.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/mvme68k/stand/sboot/console.c
diff -u src/sys/arch/mvme68k/stand/sboot/console.c:1.6 src/sys/arch/mvme68k/stand/sboot/console.c:1.7
--- src/sys/arch/mvme68k/stand/sboot/console.c:1.6	Sat Jan 12 09:54:33 2008
+++ src/sys/arch/mvme68k/stand/sboot/console.c	Wed Feb  2 17:53:41 2011
@@ -1,7 +1,6 @@
-/*	$NetBSD: console.c,v 1.6 2008/01/12 09:54:33 tsutsui Exp $	*/
+/*	$NetBSD: console.c,v 1.7 2011/02/02 17:53:41 chuck Exp $	*/
 
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor and Seth Widoff
  * All rights reserved.
  *
@@ -13,12 +12,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Charles D. Cranor
- *	and Seth Widoff.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/mvme68k/stand/sboot/sboot.c
diff -u src/sys/arch/mvme68k/stand/sboot/sboot.c:1.6 src/sys/arch/mvme68k/stand/sboot/sboot.c:1.7
--- src/sys/arch/mvme68k/stand/sboot/sboot.c:1.6	Sat Jan 12 09:54:33 2008
+++ src/sys/arch/mvme68k/stand/sboot/sboot.c	Wed Feb  2 17:53:41 2011
@@ -1,7 +1,6 @@
-/*	$NetBSD: sboot.c,v 1.6 2008/01/12 09:54:33 tsutsui Exp $	*/
+/*	$NetBSD: sboot.c,v 1.7 2011/02/02 17:53:41 chuck Exp $	*/
 
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor and Seth Widoff
  * All rights reserved.
  *
@@ -13,12 +12,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Charles D. Cranor
- *	and Seth Widoff.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/mvme68k/stand/sboot/sboot.h
diff -u src/sys/arch/mvme68k/stand/sboot/sboot.h:1.6 src/sys/arch/mvme68k/stand/sboot/sboot.h:1.7
--- src/sys/arch/mvme68k/stand/sboot/sboot.h:1.6	Sun Mar  4 06:00:24 2007
+++ src/sys/arch/mvme68k/stand/sboot/sboot.h	Wed Feb  2 17:53:41 2011
@@ -1,7 +1,6 @@
-/*	$NetBSD: sboot.h,v 1.6 2007/03/04 06:00:24 christos Exp $	*/
+/*	$NetBSD: sboot.h,v 1.7 2011/02/02 17:53:41 chuck Exp $	*/
 
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor and Seth Widoff
  * All rights reserved.
  *
@@ -13,12 +12,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Charles D. Cranor
- *	and Seth Widoff.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/mvme68k/stand/sboot/etherfun.c
diff -u src/sys/arch/mvme68k/stand/sboot/etherfun.c:1.9

CVS commit: [bouyer-quota2] src/tests/fs/ffs

2011-02-02 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Wed Feb  2 19:17:09 UTC 2011

Modified Files:
src/tests/fs/ffs [bouyer-quota2]: Makefile quotas_common.sh
t_getquota.sh t_setquota.sh
src/tests/fs/ffs/clients [bouyer-quota2]: Makefile
Added Files:
src/tests/fs/ffs [bouyer-quota2]: h_quota2_tests.c t_quotalimit.sh

Log Message:
Check that the kernel enforces the quota limits and grace times.


To generate a diff of this commit:
cvs rdiff -u -r1.14.2.3 -r1.14.2.4 src/tests/fs/ffs/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/tests/fs/ffs/h_quota2_tests.c \
src/tests/fs/ffs/t_quotalimit.sh
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/tests/fs/ffs/quotas_common.sh
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/tests/fs/ffs/t_getquota.sh \
src/tests/fs/ffs/t_setquota.sh
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/tests/fs/ffs/clients/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/fs/ffs/Makefile
diff -u src/tests/fs/ffs/Makefile:1.14.2.3 src/tests/fs/ffs/Makefile:1.14.2.4
--- src/tests/fs/ffs/Makefile:1.14.2.3	Sun Jan 30 12:37:34 2011
+++ src/tests/fs/ffs/Makefile	Wed Feb  2 19:17:08 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14.2.3 2011/01/30 12:37:34 bouyer Exp $
+#	$NetBSD: Makefile,v 1.14.2.4 2011/02/02 19:17:08 bouyer Exp $
 #
 
 .include bsd.own.mk
@@ -8,12 +8,16 @@
 TESTSDIR=	${TESTSBASE}/fs/ffs
 WARNS=		4
 
-PROGS=			h_quota2_server 
+PROGS=			h_quota2_server h_quota2_tests
 SRCS.h_quota2_server=	h_quota2_server.c
 MAN.h_quota2_server=	# empty
 BINDIR.h_quota2_server=	${TESTSDIR}
 
-.for name in t_getquota t_setquota
+SRCS.h_quota2_tests=	h_quota2_tests.c
+MAN.h_quota2_tests=	# empty
+BINDIR.h_quota2_tests=	${TESTSDIR}
+
+.for name in t_getquota t_setquota t_quotalimit
 TESTS_SH+=	${name}
 TESTS_SH_SRC_${name}=	quotas_common.sh ${name}.sh
 .endfor

Index: src/tests/fs/ffs/quotas_common.sh
diff -u src/tests/fs/ffs/quotas_common.sh:1.1.2.4 src/tests/fs/ffs/quotas_common.sh:1.1.2.5
--- src/tests/fs/ffs/quotas_common.sh:1.1.2.4	Mon Jan 31 22:04:26 2011
+++ src/tests/fs/ffs/quotas_common.sh	Wed Feb  2 19:17:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: quotas_common.sh,v 1.1.2.4 2011/01/31 22:04:26 bouyer Exp $ 
+# $NetBSD: quotas_common.sh,v 1.1.2.5 2011/02/02 19:17:08 bouyer Exp $ 
 
 create_with_quotas()
 {
@@ -13,6 +13,11 @@
 	fi
 	atf_check -o ignore -e ignore newfs ${op} \
 		-B ${endian} -O ${vers} -s 4000 -F ${IMG}
+}
+
+create_with_quotas_server()
+{	
+	create_with_quotas $*
 	atf_check -o ignore -e ignore $(atf_get_srcdir)/h_quota2_server -b \
 		${IMG} ${RUMP_SERVER}
 }

Index: src/tests/fs/ffs/t_getquota.sh
diff -u src/tests/fs/ffs/t_getquota.sh:1.1.2.5 src/tests/fs/ffs/t_getquota.sh:1.1.2.6
--- src/tests/fs/ffs/t_getquota.sh:1.1.2.5	Mon Jan 31 22:04:26 2011
+++ src/tests/fs/ffs/t_getquota.sh	Wed Feb  2 19:17:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_getquota.sh,v 1.1.2.5 2011/01/31 22:04:26 bouyer Exp $ 
+# $NetBSD: t_getquota.sh,v 1.1.2.6 2011/02/02 19:17:08 bouyer Exp $ 
 #
 #  Copyright (c) 2011 Manuel Bouyer
 #  All rights reserved.
@@ -38,7 +38,7 @@
 
 get_quota()
 {
-	create_with_quotas $*
+	create_with_quotas_server $*
 	local q=$3
 	local expect
 	local fail
Index: src/tests/fs/ffs/t_setquota.sh
diff -u src/tests/fs/ffs/t_setquota.sh:1.1.2.5 src/tests/fs/ffs/t_setquota.sh:1.1.2.6
--- src/tests/fs/ffs/t_setquota.sh:1.1.2.5	Mon Jan 31 22:04:26 2011
+++ src/tests/fs/ffs/t_setquota.sh	Wed Feb  2 19:17:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_setquota.sh,v 1.1.2.5 2011/01/31 22:04:26 bouyer Exp $ 
+# $NetBSD: t_setquota.sh,v 1.1.2.6 2011/02/02 19:17:08 bouyer Exp $ 
 #
 #  Copyright (c) 2011 Manuel Bouyer
 #  All rights reserved.
@@ -46,7 +46,7 @@
 
 set_quota()
 {
-	create_with_quotas $*
+	create_with_quotas_server $*
 	local q=$3
 	local expect
 	local fail
@@ -102,7 +102,7 @@
 
 set_quota_new()
 {
-	create_with_quotas $*
+	create_with_quotas_server $*
 	local q=$3
 	local expect
 	local fail
@@ -152,7 +152,7 @@
 
 set_quota_default()
 {
-	create_with_quotas $*
+	create_with_quotas_server $*
 	local q=$3
 	local expect
 	local fail

Index: src/tests/fs/ffs/clients/Makefile
diff -u src/tests/fs/ffs/clients/Makefile:1.1.2.3 src/tests/fs/ffs/clients/Makefile:1.1.2.4
--- src/tests/fs/ffs/clients/Makefile:1.1.2.3	Sun Jan 30 00:27:56 2011
+++ src/tests/fs/ffs/clients/Makefile	Wed Feb  2 19:17:09 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.2.3 2011/01/30 00:27:56 bouyer Exp $
+#	$NetBSD: Makefile,v 1.1.2.4 2011/02/02 19:17:09 bouyer Exp $
 #
 
 .include bsd.own.mk
@@ -6,7 +6,7 @@
 TESTSDIR=	${TESTSBASE}/fs/ffs
 WARNS=		4
 
-PROGS=			rump_quota rump_repquota rump_edquota
+PROGS=			rump_quota rump_repquota rump_edquota rump_quotactl
 
 .PATH: ${NETBSDSRCDIR}/usr.bin/quota
 SRCS.rump_quota=	quota.c printquota.c getvfsquota.c quota_rumpops.c
@@ -24,10 +24,15 @@
 SRCS.rump_edquota+=	edquota.c
 CPPFLAGS.edquota.c+=	-I${NETBSDSRCDIR}/sys -I${NETBSDSRCDIR}/usr.bin/quota
 
+.PATH:

CVS commit: src/sys

2011-02-02 Thread Chuck Cranor

Module Name:src
Committed By:   chuck
Date:   Wed Feb  2 20:10:09 UTC 2011

Modified Files:
src/sys/compat/netbsd32: netbsd32_core.c
src/sys/kern: core_netbsd.c

Log Message:
udpate license clauses on my code to match the new-style BSD licenses.
verified with Mike Hibler it is ok to remove clause 3 on utah copyright,
as per UCB.
based on diff that rmind@ sent me.

no functional change with this commit.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/compat/netbsd32/netbsd32_core.c
cvs rdiff -u -r1.17 -r1.18 src/sys/kern/core_netbsd.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_core.c
diff -u src/sys/compat/netbsd32/netbsd32_core.c:1.13 src/sys/compat/netbsd32/netbsd32_core.c:1.14
--- src/sys/compat/netbsd32/netbsd32_core.c:1.13	Sun Dec 11 12:20:22 2005
+++ src/sys/compat/netbsd32/netbsd32_core.c	Wed Feb  2 20:10:09 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_core.c,v 1.13 2005/12/11 12:20:22 christos Exp $	*/
+/*	$NetBSD: netbsd32_core.c,v 1.14 2011/02/02 20:10:09 chuck Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -19,12 +19,7 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Charles D. Cranor,
- *	Washington University, the University of California, Berkeley and
- *	its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *may be used to endorse or promote products derived from this software
  *without specific prior written permission.
  *
@@ -50,7 +45,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_core.c,v 1.13 2005/12/11 12:20:22 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_core.c,v 1.14 2011/02/02 20:10:09 chuck Exp $);
 
 #define	CORENAME(x)	__CONCAT(x,32)
 #define	COREINC		compat/netbsd32/netbsd32.h

Index: src/sys/kern/core_netbsd.c
diff -u src/sys/kern/core_netbsd.c:1.17 src/sys/kern/core_netbsd.c:1.18
--- src/sys/kern/core_netbsd.c:1.17	Fri Jan 14 02:06:34 2011
+++ src/sys/kern/core_netbsd.c	Wed Feb  2 20:10:09 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: core_netbsd.c,v 1.17 2011/01/14 02:06:34 rmind Exp $	*/
+/*	$NetBSD: core_netbsd.c,v 1.18 2011/02/02 20:10:09 chuck Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -19,12 +19,7 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Charles D. Cranor,
- *	Washington University, the University of California, Berkeley and
- *	its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *may be used to endorse or promote products derived from this software
  *without specific prior written permission.
  *
@@ -50,7 +45,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: core_netbsd.c,v 1.17 2011/01/14 02:06:34 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: core_netbsd.c,v 1.18 2011/02/02 20:10:09 chuck Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_coredump.h

CVS commit: [bouyer-quota2] src/tests/fs/ffs

2011-02-02 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Wed Feb  2 21:01:09 UTC 2011

Modified Files:
src/tests/fs/ffs [bouyer-quota2]: t_quotalimit.sh

Log Message:
Check that a new id properly get limits from the defaults.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/tests/fs/ffs/t_quotalimit.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/fs/ffs/t_quotalimit.sh
diff -u src/tests/fs/ffs/t_quotalimit.sh:1.1.2.1 src/tests/fs/ffs/t_quotalimit.sh:1.1.2.2
--- src/tests/fs/ffs/t_quotalimit.sh:1.1.2.1	Wed Feb  2 19:17:08 2011
+++ src/tests/fs/ffs/t_quotalimit.sh	Wed Feb  2 21:01:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_quotalimit.sh,v 1.1.2.1 2011/02/02 19:17:08 bouyer Exp $ 
+# $NetBSD: t_quotalimit.sh,v 1.1.2.2 2011/02/02 21:01:08 bouyer Exp $ 
 #
 #  Copyright (c) 2011 Manuel Bouyer
 #  All rights reserved.
@@ -36,6 +36,10 @@
 	 hit hard limit ino quota with ${q} enabled ${e} ${v} ${q}
   test_case_root sinolimit_${e}_${v}_${q} limit_softiquota \
 	 hit soft limit ino quota with ${q} enabled after grace time ${e} ${v} ${q}
+  test_case_root herit_defq_${e}_${v}_${q} inherit_defaultquota \
+	 new id herit from default for ${q} quota ${e} ${v} ${q}
+  test_case_root herit_idefq_${e}_${v}_${q} inherit_defaultiquota \
+	 new id herit from default for ${q} ino quota ${e} ${v} ${q}
 done
   done
 done
@@ -227,3 +231,107 @@
 	done
 	rump_shutdown
 }
+
+inherit_defaultquota()
+{
+	create_with_quotas_server $*
+	local q=$3
+	local expect
+	local id=1
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	both)
+		expect=u g
+		fail=
+		;;
+	*)
+		atf_fail wrong quota type
+		;;
+	esac
+
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		   $(atf_get_srcdir)/rump_edquota -$q -s2k/4 -h3k/6 \
+		   -t 2h/2h -d
+	done
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		-o match:'Disk quotas for .*id 1\): none' \
+		$(atf_get_srcdir)/rump_quota -$q -v ${id}
+	done
+	atf_check -s exit:0 rump.halt
+
+	#now start the server which does the limits tests
+	atf_check -s exit:0 -o ignore \
+-e match:'test 0: write up to hard limit returned 69: Disc quota exceeded' \
+	$(atf_get_srcdir)/h_quota2_tests -b 0 ${IMG} ${RUMP_SERVER}
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		-o match:'/mnt   2560 B\*  2048 B   3072 B 2:0  2   4   6 ' \
+		$(atf_get_srcdir)/rump_quota -$q -h ${id}
+		atf_check -s exit:0 \
+		-o match:'daemon\+-2232:0 2   4   6' \
+		$(atf_get_srcdir)/rump_repquota -$q /mnt
+	done
+	rump_shutdown
+}
+
+inherit_defaultiquota()
+{
+	create_with_quotas_server $*
+	local q=$3
+	local expect
+	local id=1
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	both)
+		expect=u g
+		fail=
+		;;
+	*)
+		atf_fail wrong quota type
+		;;
+	esac
+
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		   $(atf_get_srcdir)/rump_edquota -$q -s2m/4 -h3m/6 \
+		   -t 2h/2h -d
+	done
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		-o match:'Disk quotas for .*id 1\): none' \
+		$(atf_get_srcdir)/rump_quota -$q -v ${id}
+	done
+	atf_check -s exit:0 rump.halt
+
+	#now start the server which does the limits tests
+	atf_check -s exit:0 -o ignore \
+-e match:'test 2: create file up to hard limit returned 69: Disc quota exceeded' \
+	$(atf_get_srcdir)/h_quota2_tests -b 2 ${IMG} ${RUMP_SERVER}
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		-o match:'/mnt   2560 B   2048 K   3072 K  5 \* 4   6  2:0' \
+		$(atf_get_srcdir)/rump_quota -$q -h ${id}
+		atf_check -s exit:0 \
+		-o match:'daemon-\+2 2048 30725   4   62:0' \
+		$(atf_get_srcdir)/rump_repquota -$q /mnt
+	done
+	rump_shutdown
+}

CVS commit: src/sys/net/npf

2011-02-02 Thread Mindaugas Rasiukevicius

Module Name:src
Committed By:   rmind
Date:   Wed Feb  2 23:01:34 UTC 2011

Modified Files:
src/sys/net/npf: npf.h

Log Message:
Bump NPF_VERSION.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/net/npf/npf.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/net/npf/npf.h
diff -u src/sys/net/npf/npf.h:1.7 src/sys/net/npf/npf.h:1.8
--- src/sys/net/npf/npf.h:1.7	Wed Feb  2 02:20:25 2011
+++ src/sys/net/npf/npf.h	Wed Feb  2 23:01:34 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf.h,v 1.7 2011/02/02 02:20:25 rmind Exp $	*/
+/*	$NetBSD: npf.h,v 1.8 2011/02/02 23:01:34 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2009-2011 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
 #include testing.h
 #endif
 
-#define	NPF_VERSION		1
+#define	NPF_VERSION		2
 
 /*
  * Public declarations and definitions.

CVS commit: src/distrib/sets/lists/comp

2011-02-02 Thread Nicolas Joly

Module Name:src
Committed By:   njoly
Date:   Wed Feb  2 23:27:12 UTC 2011

Modified Files:
src/distrib/sets/lists/comp: shl.mi

Log Message:
+libnpf.so.0.0.debug


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/distrib/sets/lists/comp/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/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.155 src/distrib/sets/lists/comp/shl.mi:1.156
--- src/distrib/sets/lists/comp/shl.mi:1.155	Wed Feb  2 02:20:27 2011
+++ src/distrib/sets/lists/comp/shl.mi	Wed Feb  2 23:27:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.155 2011/02/02 02:20:27 rmind Exp $
+# $NetBSD: shl.mi,v 1.156 2011/02/02 23:27:11 njoly Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -270,6 +270,7 @@
 ./usr/libdata/debug/usr/lib/libmenu.so.6.0.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libmj.so.0.0.debug		comp-crypto-debug	debug
 ./usr/libdata/debug/usr/lib/libnetpgp.so.3.0.debug	comp-crypto-debug	crypto,debug
+./usr/libdata/debug/usr/lib/libnpf.so.0.0.debug		comp-npf-debug	npf,debug
 ./usr/libdata/debug/usr/lib/libnvpair.so.0.0.debug	comp-zfs-debug	zfs,dynamicroot,debug
 ./usr/libdata/debug/usr/lib/libobjc.so.2.0.debug	comp-sys-debug	gcc=3,debug
 ./usr/libdata/debug/usr/lib/libobjc.so.3.0.debug	comp-sys-debug	gcc=4,debug

CVS commit: src/lib/libpam/modules/pam_exec

2011-02-02 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Feb  3 02:06:00 UTC 2011

Modified Files:
src/lib/libpam/modules/pam_exec: pam_exec.c

Log Message:
PR/44505: Mark Davies: pam_exec fails to realloc enough space, while
there add a volatile variable (From FreeBSD)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libpam/modules/pam_exec/pam_exec.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/libpam/modules/pam_exec/pam_exec.c
diff -u src/lib/libpam/modules/pam_exec/pam_exec.c:1.4 src/lib/libpam/modules/pam_exec/pam_exec.c:1.5
--- src/lib/libpam/modules/pam_exec/pam_exec.c:1.4	Sat Feb 26 17:45:52 2005
+++ src/lib/libpam/modules/pam_exec/pam_exec.c	Wed Feb  2 21:05:59 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pam_exec.c,v 1.4 2005/02/26 22:45:52 christos Exp $	*/
+/*	$NetBSD: pam_exec.c,v 1.5 2011/02/03 02:05:59 christos Exp $	*/
 
 /*-
  * Copyright (c) 2001,2003 Networks Associates Technology, Inc.
@@ -38,7 +38,7 @@
 #ifdef __FreeBSD__
 __FBSDID($FreeBSD: src/lib/libpam/modules/pam_exec/pam_exec.c,v 1.4 2005/02/01 10:37:07 des Exp $);
 #else
-__RCSID($NetBSD: pam_exec.c,v 1.4 2005/02/26 22:45:52 christos Exp $);
+__RCSID($NetBSD: pam_exec.c,v 1.5 2011/02/03 02:05:59 christos Exp $);
 #endif
 
 #include sys/types.h
@@ -70,8 +70,9 @@
 _pam_exec(pam_handle_t *pamh __unused, int flags __unused,
 int argc, const char *argv[])
 {
-	int childerr, envlen, i, nitems, pam_err, status;
+	int envlen, i, nitems, pam_err, status;
 	char **envlist, **tmp;
+	volatile int childerr;
 	pid_t pid;
 
 	if (argc  1)
@@ -90,7 +91,7 @@
 	for (envlen = 0; envlist[envlen] != NULL; ++envlen)
 		/* nothing */ ;
 	nitems = sizeof(env_items) / sizeof(*env_items);
-	tmp = realloc(envlist, (envlen + nitems + 1) * sizeof **envlist);
+	tmp = realloc(envlist, (envlen + nitems + 1) * sizeof(*envlist));
 	if (tmp == NULL) {
 		openpam_free_envlist(envlist);
 		return (PAM_BUF_ERR);

CVS commit: [matt-nb5-mips64] src/sys/lib/libkern

2011-02-02 Thread Cliff Neighbors

Module Name:src
Committed By:   cliff
Date:   Thu Feb  3 02:24:21 UTC 2011

Modified Files:
src/sys/lib/libkern [matt-nb5-mips64]: libkern.h

Log Message:
fix KASSERTMSG


To generate a diff of this commit:
cvs rdiff -u -r1.82.8.1 -r1.82.8.2 src/sys/lib/libkern/libkern.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/lib/libkern/libkern.h
diff -u src/sys/lib/libkern/libkern.h:1.82.8.1 src/sys/lib/libkern/libkern.h:1.82.8.2
--- src/sys/lib/libkern/libkern.h:1.82.8.1	Wed Apr 21 00:28:20 2010
+++ src/sys/lib/libkern/libkern.h	Thu Feb  3 02:24:21 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: libkern.h,v 1.82.8.1 2010/04/21 00:28:20 matt Exp $	*/
+/*	$NetBSD: libkern.h,v 1.82.8.2 2011/02/03 02:24:21 cliff Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -208,7 +208,7 @@
 #else /* DIAGNOSTIC */
 #define _DIAGASSERT(a)	assert(a)
 #define	KASSERTMSG(e, msg) do {		\
-	if (__predict_false((e)))	\
+	if (__predict_false(!(e)))	\
 		panic msg;		\
 	} while (/*CONSTCOND*/ 0)
 #ifdef __STDC__

CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

2011-02-02 Thread Cliff Neighbors

Module Name:src
Committed By:   cliff
Date:   Thu Feb  3 02:36:42 UTC 2011

Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: pmap_tlb.c

Log Message:
fix use of KASSERTMSG


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/sys/arch/mips/mips/pmap_tlb.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_tlb.c
diff -u src/sys/arch/mips/mips/pmap_tlb.c:1.1.2.15 src/sys/arch/mips/mips/pmap_tlb.c:1.1.2.16
--- src/sys/arch/mips/mips/pmap_tlb.c:1.1.2.15	Wed Dec 29 00:33:32 2010
+++ src/sys/arch/mips/mips/pmap_tlb.c	Thu Feb  3 02:36:41 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_tlb.c,v 1.1.2.15 2010/12/29 00:33:32 matt Exp $	*/
+/*	$NetBSD: pmap_tlb.c,v 1.1.2.16 2011/02/03 02:36:41 cliff Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(0, $NetBSD: pmap_tlb.c,v 1.1.2.15 2010/12/29 00:33:32 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_tlb.c,v 1.1.2.16 2011/02/03 02:36:41 cliff Exp $);
 
 /*
  * Manages address spaces in a TLB.
@@ -122,6 +122,7 @@
  * a lot of overhead for not much gain.
  */
 
+#include opt_multiprocessor.h
 #include opt_sysv.h
 #include opt_cputype.h
 #include opt_mips_cache.h
@@ -1011,7 +1012,7 @@
 	uint32_t tlb_hi;
 	__asm(mfc0 %0,$%1 : =r(tlb_hi) : n(MIPS_COP_0_TLB_HI));
 	uint32_t asid = (tlb_hi  MIPS_TLB_PID)  MIPS_TLB_PID_SHIFT;
-	KASSERTMSG(asid != curcpu()-ci_pmap_asid_cur,
+	KASSERTMSG(asid == curcpu()-ci_pmap_asid_cur,
 	   (tlb_hi (%#x) asid (%#x) != current asid (%#x),
 	tlb_hi, asid, curcpu()-ci_pmap_asid_cur));
 #endif

CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

2011-02-02 Thread Cliff Neighbors

Module Name:src
Committed By:   cliff
Date:   Thu Feb  3 02:39:47 UTC 2011

Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mips_softint.c syscall.c

Log Message:
fix KASSERTMSG useage


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/arch/mips/mips/mips_softint.c
cvs rdiff -u -r1.37.12.13 -r1.37.12.14 src/sys/arch/mips/mips/syscall.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/mips_softint.c
diff -u src/sys/arch/mips/mips/mips_softint.c:1.1.2.6 src/sys/arch/mips/mips/mips_softint.c:1.1.2.7
--- src/sys/arch/mips/mips/mips_softint.c:1.1.2.6	Mon Feb 22 20:17:09 2010
+++ src/sys/arch/mips/mips/mips_softint.c	Thu Feb  3 02:39:46 2011
@@ -29,7 +29,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: mips_softint.c,v 1.1.2.6 2010/02/22 20:17:09 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: mips_softint.c,v 1.1.2.7 2011/02/03 02:39:46 cliff Exp $);
 
 #include sys/param.h
 #include sys/proc.h
@@ -104,7 +104,7 @@
 		softint_fast_dispatch(ci-ci_softlwps[SOFTINT_##level], \
 		IPL_SOFT##level); \
 		KASSERT(ci-ci_softlwps[SOFTINT_##level]-l_ctxswtch == 0); \
-		KASSERTMSG(ci-ci_cpl != IPL_HIGH, (cpl (%d) != HIGH, ci-ci_cpl)); \
+		KASSERTMSG(ci-ci_cpl == IPL_HIGH, (cpl (%d) != HIGH, ci-ci_cpl)); \
 		continue; \
 	}
 

Index: src/sys/arch/mips/mips/syscall.c
diff -u src/sys/arch/mips/mips/syscall.c:1.37.12.13 src/sys/arch/mips/mips/syscall.c:1.37.12.14
--- src/sys/arch/mips/mips/syscall.c:1.37.12.13	Wed Dec 29 00:47:50 2010
+++ src/sys/arch/mips/mips/syscall.c	Thu Feb  3 02:39:46 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: syscall.c,v 1.37.12.13 2010/12/29 00:47:50 matt Exp $	*/
+/*	$NetBSD: syscall.c,v 1.37.12.14 2011/02/03 02:39:46 cliff Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -107,7 +107,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: syscall.c,v 1.37.12.13 2010/12/29 00:47:50 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: syscall.c,v 1.37.12.14 2011/02/03 02:39:46 cliff Exp $);
 
 #if defined(_KERNEL_OPT)
 #include opt_sa.h
@@ -175,7 +175,7 @@
 	int code, error;
 #if defined(__mips_o32)
 	const int abi = _MIPS_BSD_API_O32;
-	KASSERTMSG(p-p_md.md_abi != abi, (pid %d(%p): md_abi(%d) != abi(%d), p-p_pid, p, p-p_md.md_abi, abi));
+	KASSERTMSG(p-p_md.md_abi == abi, (pid %d(%p): md_abi(%d) != abi(%d), p-p_pid, p, p-p_md.md_abi, abi));
 	size_t nregs = 4;
 #else
 	const int abi = p-p_md.md_abi;

CVS commit: src/crypto/external/bsd/openssh/dist

2011-02-02 Thread enami tsugutomo

Module Name:src
Committed By:   enami
Date:   Thu Feb  3 04:24:23 UTC 2011

Modified Files:
src/crypto/external/bsd/openssh/dist: sshd_config.5

Log Message:
Note that our installed sshd_config overwrite the LoginGraceTime to 600s.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/sshd_config.5

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/openssh/dist/sshd_config.5
diff -u src/crypto/external/bsd/openssh/dist/sshd_config.5:1.7 src/crypto/external/bsd/openssh/dist/sshd_config.5:1.8
--- src/crypto/external/bsd/openssh/dist/sshd_config.5:1.7	Sun Nov 21 18:59:04 2010
+++ src/crypto/external/bsd/openssh/dist/sshd_config.5	Thu Feb  3 04:24:23 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: sshd_config.5,v 1.7 2010/11/21 18:59:04 adam Exp $
+.\	$NetBSD: sshd_config.5,v 1.8 2011/02/03 04:24:23 enami Exp $
 .\  -*- nroff -*-
 .\
 .\ Author: Tatu Ylonen y...@cs.hut.fi
@@ -36,7 +36,7 @@
 .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\
 .\ $OpenBSD: sshd_config.5,v 1.125 2010/06/30 07:28:34 jmc Exp $
-.Dd June 30, 2010
+.Dd February 3, 2010
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -589,7 +589,9 @@
 The server disconnects after this time if the user has not
 successfully logged in.
 If the value is 0, there is no time limit.
-The default is 120 seconds.
+The default is 120 seconds but the default
+.Pa /etc/ssh/sshd_config
+overwrites it to 600 seconds.
 .It Cm LogLevel
 Gives the verbosity level that is used when logging messages from
 .Xr sshd 8 .

CVS commit: src/sys/arch/powerpc/powerpc

CVS commit: src/lib/libnpf

CVS commit: src/share/man/man7

CVS commit: src/sys/arch/x86

CVS commit: src/sys/rump/librump/rumpvfs

CVS commit: src/tests/fs/vfs

CVS commit: src/sys/uvm

CVS commit: src/lib/libnpf

CVS commit: src/sys/uvm

CVS commit: src/sys/uvm

CVS commit: src/sys/rump/librump/rumpvfs

CVS commit: src/sys/rump/librump/rumpvfs

CVS commit: src/common/lib/libprop

CVS commit: src/sys

CVS commit: [bouyer-quota2] src/tests/fs/ffs

CVS commit: src/sys

CVS commit: [bouyer-quota2] src/tests/fs/ffs

CVS commit: src/sys/net/npf

CVS commit: src/distrib/sets/lists/comp

CVS commit: src/lib/libpam/modules/pam_exec

CVS commit: [matt-nb5-mips64] src/sys/lib/libkern

CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

CVS commit: src/crypto/external/bsd/openssh/dist

24 matches

Site Navigation

Mail list logo

Footer information