From owner-p4-projects@FreeBSD.ORG  Thu Jul 15 17:46:58 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8D1FD1065675; Thu, 15 Jul 2010 17:46:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4FDD01065672
	for <perforce@freebsd.org>; Thu, 15 Jul 2010 17:46:58 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3DC148FC1C
	for <perforce@freebsd.org>; Thu, 15 Jul 2010 17:46:58 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o6FHkwvF083451
	for <perforce@freebsd.org>; Thu, 15 Jul 2010 17:46:58 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6FHkwQC083449
	for perforce@freebsd.org; Thu, 15 Jul 2010 17:46:58 GMT
	(envelope-from trasz@freebsd.org)
Date: Thu, 15 Jul 2010 17:46:58 GMT
Message-Id: <201007151746.o6FHkwQC083449@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181009 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jul 2010 17:46:58 -0000

http://p4web.freebsd.org/@@181009?ac=10

Change 181009 by trasz@trasz_victim on 2010/07/15 17:46:17

	Remove resource accounting from compat_svr4 version of poll(2);
	it's not needed there.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_filio.c#8 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_filio.c#8 (text+ko) ====

@@ -37,7 +37,6 @@
 #include <sys/lock.h>
 #include <sys/signal.h>
 #include <sys/filedesc.h>
-#include <sys/container.h>
 #include <sys/poll.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
@@ -67,9 +66,6 @@
      int idx = 0, cerr;
      u_long siz;
 
-     /*
-      * XXX: What is this for?
-      */
      PROC_LOCK(td->td_proc);
      if (uap->nfds > lim_cur(td->td_proc, RLIMIT_NOFILE) &&
        uap->nfds > FD_SETSIZE) {
@@ -78,9 +74,6 @@
      }
      PROC_UNLOCK(td->td_proc);
 
-#ifdef CONTAINERS
-     rusage_add(td->td_proc, RUSAGE_FILEDESCRIPTORS, uap->nfds);
-#endif
      pa.fds = uap->fds;
      pa.nfds = uap->nfds;
      pa.timeout = uap->timeout;
@@ -106,9 +99,6 @@
 		       forget to update it if I add more code */
      }
 done:
-#ifdef CONTAINERS
-     rusage_sub(td->td_proc, RUSAGE_FILEDESCRIPTORS, uap->nfds);
-#endif
      free(pfd, M_TEMP);
      return error;
 }