Sun Mar 15 20:20:03 2009 UTC ()

Pull up following revision(s) (requested by mrg in ticket #565):
	sys/kern/init_sysctl.c: revision 1.158
always calculate "needed" for KERN_FILE2 calls.  this allows a caller
to get an estimate of the needed space, like the intention is.


(snj)

diff -r1.149.4.1 -r1.149.4.2 src/sys/kern/init_sysctl.c

--- src/sys/kern/init_sysctl.c 2008/11/29 20:51:06	1.149.4.1
+++ src/sys/kern/init_sysctl.c 2009/03/15 20:20:02	1.149.4.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: init_sysctl.c,v 1.149.4.1 2008/11/29 20:51:06 bouyer Exp $ */
+/*	$NetBSD: init_sysctl.c,v 1.149.4.2 2009/03/15 20:20:02 snj Exp $ */
 /*-
  * Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Brown, and by Andrew Doran.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.149.4.1 2008/11/29 20:51:06 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.149.4.2 2009/03/15 20:20:02 snj Exp $");
 #include "opt_sysv.h"
 #include "opt_compat_netbsd32.h"
 #include "opt_sa.h"
 #include "pty.h"
 #include "rnd.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/cpu.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 @@ -1995,28 +1995,28 @@ sysctl_kern_file2(SYSCTLFN_ARGS)
 				mutex_exit(&filelist_lock);
 				error = dcopyout(l, &kf, dp, out_size);
 				mutex_enter(&filelist_lock);
 				np = LIST_NEXT(tp, f_list);
 				LIST_REMOVE(tp, f_list);
 				if (error) {
 					break;
+				}
 				dp += elem_size;
 				len -= elem_size;
 			} else {
 				mutex_exit(&fp->f_lock);
+			}
 			needed += elem_size;
 			if (elem_count > 0) {
 				needed += elem_size;
 				if (elem_count != INT_MAX)
 					elem_count--;
+			}
+		}
 		mutex_exit(&filelist_lock);
 		fputdummy(tp);
 		sysctl_relock();
 		break;
 	case KERN_FILE_BYPID:
 		if (arg < -1)
 			/* -1 means all processes */
 			return (EINVAL);
 		sysctl_unlock();
 @@ -2071,28 +2071,28 @@ sysctl_kern_file2(SYSCTLFN_ARGS)
 					fill_file(&kf, fp, ff, i, p->p_pid);
 					mutex_exit(&fp->f_lock);
 					mutex_exit(&ff->ff_lock);
 					mutex_exit(&fd->fd_lock);
 					error = dcopyout(l, &kf, dp, out_size);
 					mutex_enter(&fd->fd_lock);
 					if (error)
 						break;
 					dp += elem_size;
 					len -= elem_size;
 				} else {
 					mutex_exit(&ff->ff_lock);
+				}
 				needed += elem_size;
 				if (elem_count > 0) {
 					needed += elem_size;
 					if (elem_count != INT_MAX)
 						elem_count--;
+				}
+			}
 			mutex_exit(&fd->fd_lock);
 			/*
 			 * Release reference to process.
 			 */
 			mutex_enter(proc_lock);
 			rw_exit(&p->p_reflock);
+		}
 		mutex_exit(proc_lock);