Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Oct 2005 04:50:21 -0700 (PDT)
From:      Don Lewis <truckman@FreeBSD.org>
To:        kometen@gmail.com
Cc:        current@FreeBSD.org
Subject:   Re: patch review & testing request for fill_kinfo_proc() and friends
Message-ID:  <200510021150.j92BoLPP015748@gw.catspoiler.org>
In-Reply-To: <b41c75520510020425j756aa1fcy@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On  2 Oct, Claus Guttesen wrote:
> 2005/10/2, Don Lewis <truckman@freebsd.org>:
>> 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.




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510021150.j92BoLPP015748>