From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 12:56:05 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 16AA3CE6;
 Sun, 23 Dec 2012 12:56:05 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EE9B48FC12;
 Sun, 23 Dec 2012 12:56:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBNCu4iI096002;
 Sun, 23 Dec 2012 12:56:04 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBNCu4xD096001;
 Sun, 23 Dec 2012 12:56:04 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201212231256.qBNCu4xD096001@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 23 Dec 2012 12:56:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244627 - head/share/man/man9
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 12:56:05 -0000

Author: avg
Date: Sun Dec 23 12:56:04 2012
New Revision: 244627
URL: http://svnweb.freebsd.org/changeset/base/244627

Log:
  lock.9: fix incorrect descriptions of LK_SHARED and LK_DOWNGRADE behavior
  
  Reviewed by:	attilio
  MFC after:	5 days
  X-MFC after:	r243900

Modified:
  head/share/man/man9/lock.9

Modified: head/share/man/man9/lock.9
==============================================================================
--- head/share/man/man9/lock.9	Sun Dec 23 12:46:28 2012	(r244626)
+++ head/share/man/man9/lock.9	Sun Dec 23 12:56:04 2012	(r244627)
@@ -148,7 +148,9 @@ Flags indicating what action is to be ta
 .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.