D4683.diff
No OneTemporary
Actions

Size

874 B

Referenced Files

None

Subscribers

None

D4683.diff
View Options

	Index: head/sys/kern/kern_resource.c
	===================================================================
	--- head/sys/kern/kern_resource.c
	+++ head/sys/kern/kern_resource.c
	@@ -80,8 +80,6 @@
	static struct uidinfo *uilookup(uid_t uid);
	static void ruxagg_locked(struct rusage_ext rux, struct thread td);

	-static __inline int lim_shared(struct plimit *limp);
	-
	/*
	* Resource controls and accounting.
	*/
	@@ -1109,13 +1107,6 @@
	return (limp);
	}

	-static __inline int
	-lim_shared(struct plimit *limp)
	-{
	-
	- return (limp->pl_refcnt > 1);
	-}
	-
	void
	lim_fork(struct proc p1, struct proc p2)
	{
	@@ -1146,7 +1137,7 @@
	lim_copy(struct plimit dst, struct plimit src)
	{

	- KASSERT(!lim_shared(dst), ("lim_copy to shared limit"));
	+ KASSERT(dst->pl_refcnt <= 1, ("lim_copy to shared limit"));
	bcopy(src->pl_rlimit, dst->pl_rlimit, sizeof(src->pl_rlimit));
	}