From owner-freebsd-hackers@FreeBSD.ORG Thu Nov 15 18:32:11 2012 Return-Path: Delivered-To: freebsd-hackers@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F2CCCD54 for ; Thu, 15 Nov 2012 18:32:10 +0000 (UTC) (envelope-from postmaster@mailpod.hostingplatform.com) Received: from atl4mhob11.myregisteredsite.com (atl4mhob11.myregisteredsite.com [209.17.115.49]) by mx1.freebsd.org (Postfix) with ESMTP id 9F0688FC13 for ; Thu, 15 Nov 2012 18:32:10 +0000 (UTC) Received: from mailpod1.hostingplatform.com (mailpod1.networksolutionsemail.com [206.188.198.65]) by atl4mhob11.myregisteredsite.com (8.14.4/8.14.4) with ESMTP id qAFIW9gE007307 for ; Thu, 15 Nov 2012 13:32:09 -0500 Received: (qmail 20751 invoked by uid 0); 15 Nov 2012 16:06:01 -0000 Received: (qmail 31192 invoked by uid 0); 15 Nov 2012 14:59:01 -0000 Received: (qmail 1296 invoked by uid 0); 15 Nov 2012 13:06:34 -0000 Received: from unknown (HELO atl4mhib28.myregisteredsite.com) (209) by 0 with SMTP; 15 Nov 2012 13:06:34 -0000 Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by atl4mhib28.myregisteredsite.com (8.14.4/8.14.4) with ESMTP id qAFD6XM4012868 for ; Thu, 15 Nov 2012 08:06:33 -0500 Received: from hub.freebsd.org (hub.FreeBSD.org [8.8.178.136]) by mx2.freebsd.org (Postfix) with ESMTP id AC21D3B6B87; Thu, 15 Nov 2012 13:06:21 +0000 (UTC) Received: from hub.FreeBSD.org (hub.FreeBSD.org [8.8.178.136]) by hub.freebsd.org (Postfix) with ESMTP id 0ACFB1AF; Thu, 15 Nov 2012 13:06:21 +0000 (UTC) (envelope-from owner-freebsd-current@freebsd.org) Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F3E09FA5; Thu, 15 Nov 2012 13:06: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 084FE8FC12; Thu, 15 Nov 2012 13:06:10 +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 PAA02734; Thu, 15 Nov 2012 15:06:09 +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 1TYz8z-000Nc0-7A; Thu, 15 Nov 2012 15:06:09 +0200 Message-ID: <50A4E8C0.5030608@FreeBSD.org> Date: Thu, 15 Nov 2012 15:06:08 +0200 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:16.0) Gecko/20121030 Thunderbird/16.0.2 MIME-Version: 1.0 To: freebsd-hackers@FreeBSD.org, freebsd-current@FreeBSD.org Subject: LK_SHARED/LK_DOWNGRADE adjustments to lock.9 manual page X-Enigmail-Version: 1.4.5 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: multipart/mixed; boundary="===============4775165132330987913==" Errors-To: owner-freebsd-current@freebsd.org Sender: owner-freebsd-current@freebsd.org X-SpamScore: 0 X-MailHub-Apparently-To: mjm@michaelmeltzer.com X-MailHub-Forwarded: Yes X-BeenThere: freebsd-hackers@freebsd.org List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Nov 2012 18:32:11 -0000 --===============4775165132330987913== Content-Type: text/plain; charset=X-VIET-VPS Content-Transfer-Encoding: 7bit To people knowing the code, do the following documentation changes look correct? --- a/share/man/man9/lock.9 +++ b/share/man/man9/lock.9 @@ -148,7 +148,9 @@ Flags indicating what action is to be taken. .Bl -tag -width ".Dv LK_CANRECURSE" .It Dv LK_SHARED Acquire a shared lock. -If an exclusive lock is currently held, it will be downgraded. +If an exclusive lock is currently held, +.Dv EDEADLK +will be returned. .It Dv LK_EXCLUSIVE Acquire an exclusive lock. If an exclusive lock is already held, and @@ -158,7 +160,8 @@ is not set, the system will .It Dv LK_DOWNGRADE Downgrade exclusive lock to a shared lock. Downgrading a shared lock is not permitted. -If an exclusive lock has been recursed, all references will be downgraded. +If an exclusive lock has been recursed, the system will +.Xr panic 9 . .It Dv LK_UPGRADE Upgrade a shared lock to an exclusive lock. If this call fails, the shared lock is lost. -- Andriy Gapon --===============4775165132330987913== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" --===============4775165132330987913==--