PERFORCE change 105245 for review

Chris Jones cdjones at FreeBSD.org
Tue Aug 29 04:51:30 UTC 2006


http://perforce.freebsd.org/chv.cgi?CH=105245

Change 105245 by cdjones at cdjones_meanook on 2006/08/29 04:50:28

	Back out unneeded comments and #include (discovered while creating patches against -RELENG_6).

Affected files ...

.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#7 edit

Differences ...

==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#7 (text+ko) ====

@@ -58,7 +58,6 @@
 #include <sys/sysctl.h>
 #include <sys/sysent.h>
 #include <sys/vnode.h>
-#include <sys/jail.h>
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
@@ -763,10 +762,6 @@
 	if (data_size > lim_cur(imgp->proc, RLIMIT_DATA) ||
 	    text_size > maxtsiz ||
 	    total_size > lim_cur(imgp->proc, RLIMIT_VMEM)) {
-/* ||
-	    (jailed(imgp->proc->p_ucred) && 
-	     total_size > (prison_memory_limit(imgp->proc->p_ucred) 
-			   - prison_memory(imgp->proc->p_ucred)))) { */
 		PROC_UNLOCK(imgp->proc);
 		return (ENOMEM);
 	}


More information about the p4-projects mailing list