svn commit: r230159 - stable/8/sys/kern

[Andriy Gapon]

on 16/01/2012 23:40 Bjoern A. Zeeb said the following:
> 
> On 16. Jan 2012, at 17:41 , Andriy Gapon wrote:
> 
>> on 15/01/2012 22:52 Eitan Adler said the following:
>>> Author: eadler (ports committer)
>>> Date: Sun Jan 15 20:52:31 2012
>>> New Revision: 230159
>>> URL: http://svn.freebsd.org/changeset/base/230159
>>>
>>> Log:
>>>  MFC r228343:
>>>  	 - Fix ktrace leakage if error is set
>>>
>>>  PR:		kern/163098
>>>  Approved by:	sbruno
>>>
>>> Modified:
>>>  stable/8/sys/kern/kern_ktrace.c
>>> Directory Properties:
>>>  stable/8/sys/   (props changed)
>>
>> Eitan,
>>
>> the list of the directory properties changes seems to be too short.
>> Have you made a common mistake of "cleaning up" the results of svn merge or do you
>> have a sparse checkout of sys?  Or something else?
> 
> I think he just uses svn 1.7.x

I haven't realized that the newer svn records the mergeinfo properties
differently from 1.6.
Sorry for the noise, Eitan and all.
And thank you for the information, Bjoern.

>>
>>> Modified: stable/8/sys/kern/kern_ktrace.c
>>> ==============================================================================
>>> --- stable/8/sys/kern/kern_ktrace.c	Sun Jan 15 20:52:01 2012	(r230158)
>>> +++ stable/8/sys/kern/kern_ktrace.c	Sun Jan 15 20:52:31 2012	(r230159)
>>> @@ -473,7 +473,7 @@ ktrsysret(code, error, retval)
>>> 	ktp = &req->ktr_data.ktr_sysret;
>>> 	ktp->ktr_code = code;
>>> 	ktp->ktr_error = error;
>>> -	ktp->ktr_retval = retval;		/* what about val2 ? */
>>> +	ktp->ktr_retval = ((error == 0) ? retval: 0);		/* what about val2 ? */
>>> 	ktr_submitrequest(curthread, req);
>>> }
>>>
>>
>>
>> -- 
>> Andriy Gapon
> 


-- 
Andriy Gapon