From owner-svn-src-stable@FreeBSD.ORG Mon Jan 16 22:49:11 2012 Return-Path: Delivered-To: svn-src-stable@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B0021065672; Mon, 16 Jan 2012 22:49:11 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id B9F1C8FC13; Mon, 16 Jan 2012 22:49:09 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id AAA26346; Tue, 17 Jan 2012 00:49:08 +0200 (EET) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1RmvMR-0002SN-RQ; Tue, 17 Jan 2012 00:49:07 +0200 Message-ID: <4F14A962.3090209@FreeBSD.org> Date: Tue, 17 Jan 2012 00:49:06 +0200 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:9.0) Gecko/20111222 Thunderbird/9.0 MIME-Version: 1.0 To: "Bjoern A. Zeeb" References: <201201152052.q0FKqVT1099586@svn.freebsd.org> <4F146140.4040203@FreeBSD.org> In-Reply-To: X-Enigmail-Version: undefined Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Eitan Adler , svn-src-stable-8@FreeBSD.org Subject: Re: svn commit: r230159 - stable/8/sys/kern X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jan 2012 22:49:11 -0000 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