From owner-freebsd-current@FreeBSD.ORG Sun Oct 2 11:50:29 2005 Return-Path: X-Original-To: current@FreeBSD.org Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E89A16A41F for ; Sun, 2 Oct 2005 11:50:29 +0000 (GMT) (envelope-from truckman@FreeBSD.org) Received: from gw.catspoiler.org (217-ip-163.nccn.net [209.79.217.163]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FE0743D46 for ; Sun, 2 Oct 2005 11:50:29 +0000 (GMT) (envelope-from truckman@FreeBSD.org) Received: from FreeBSD.org (mousie.catspoiler.org [192.168.101.2]) by gw.catspoiler.org (8.13.3/8.13.3) with ESMTP id j92BoLPP015748; Sun, 2 Oct 2005 04:50:25 -0700 (PDT) (envelope-from truckman@FreeBSD.org) Message-Id: <200510021150.j92BoLPP015748@gw.catspoiler.org> Date: Sun, 2 Oct 2005 04:50:21 -0700 (PDT) From: Don Lewis To: kometen@gmail.com In-Reply-To: MIME-Version: 1.0 Content-Type: TEXT/plain; charset=us-ascii Cc: current@FreeBSD.org Subject: Re: patch review & testing request for fill_kinfo_proc() and friends X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2005 11:50:29 -0000 On 2 Oct, Claus Guttesen wrote: > 2005/10/2, Don Lewis : >> Attached is a patch that fixes locking problems in fill_kinfo_proc() and >> related functions. The patch is larger than I initially anticipated >> because I had to refactor the code in order to get the locking right. >> >> I'd like to commit it to HEAD soon so that it can be MFC'ed in time for >> 6.0-RC1, but it really needs review and testing of all the sysctl and >> linprocfs functionality. This patch also applies cleanly to RELENG_6. > > Applied the patch from RELENG_6 from Sunday Oct. 2'nd. > > twin/usr/src/sys/kern#>patch < /home/claus/temp/fifo_patch > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: kern_proc.c > |=================================================================== > |RCS file: /home/ncvs/src/sys/kern/kern_proc.c,v > |retrieving revision 1.231 > |diff -u -r1.231 kern_proc.c > |--- kern_proc.c 27 Sep 2005 18:03:15 -0000 1.231 > |+++ kern_proc.c 2 Oct 2005 08:48:56 -0000 > -------------------------- > Patching file kern_proc.c using Plan A... > Hunk #1 succeeded at 72 (offset -1 lines). > Hunk #2 failed at 597. > Hunk #3 failed at 674. > Hunk #4 failed at 728. > Hunk #5 succeeded at 738 with fuzz 1 (offset 2 lines). > Hunk #6 failed at 886. > Hunk #7 failed at 949. > 5 out of 7 hunks failed--saving rejects to kern_proc.c.rej > Hmm... Ignoring the trailing garbage. > done Judging from the chunks that failed vs. the chunks that succeeded, it looks to me like the patch file that you are using has a tab to space munge. I'll send you a private copy as a gzipped attachment.