From owner-cvs-all@FreeBSD.ORG  Sun May 11 08:53:56 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 768FC1065671;
	Sun, 11 May 2008 08:53:56 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B7AB98FC17;
	Sun, 11 May 2008 08:53:55 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4B8rtoA051513;
	Sun, 11 May 2008 08:53:55 GMT (envelope-from dfr@repoman.freebsd.org)
Received: (from dfr@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4B8rtJQ051512;
	Sun, 11 May 2008 08:53:55 GMT (envelope-from dfr)
Message-Id: <200805110853.m4B8rtJQ051512@repoman.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Sun, 11 May 2008 08:53:55 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/kern kern_lockf.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 May 2008 08:53:56 -0000

dfr         2008-05-11 08:53:55 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/kern             kern_lockf.c 
  Log:
  MFC kern_lockf.c revision 1.64:
  When blocking on an F_FLOCK style lock request which is upgrading a
  shared lock to exclusive, drop the shared lock before deadlock
  detection.
  
  Revision  Changes    Path
  1.54.2.2  +12 -11    src/sys/kern/kern_lockf.c