From owner-cvs-src-old@FreeBSD.ORG  Fri Aug 14 11:17:49 2009
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B60251065695
	for <cvs-src-old@freebsd.org>; Fri, 14 Aug 2009 11:17:49 +0000 (UTC)
	(envelope-from kib@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8A4098FC60
	for <cvs-src-old@freebsd.org>; Fri, 14 Aug 2009 11:17:49 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7EBHnKh058177
	for <cvs-src-old@freebsd.org>; Fri, 14 Aug 2009 11:17:49 GMT
	(envelope-from kib@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7EBHmFs058176
	for cvs-src-old@freebsd.org; Fri, 14 Aug 2009 11:17:48 GMT
	(envelope-from kib@repoman.freebsd.org)
Message-Id: <200908141117.n7EBHmFs058176@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	kib@repoman.freebsd.org using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 14 Aug 2009 11:17:34 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
Subject: cvs commit: src/sys/nfsclient nfs_subs.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Aug 2009 11:17:49 -0000

kib         2009-08-14 11:17:34 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_8)
    sys/nfsclient        nfs_subs.c 
  Log:
  SVN rev 196209 on 2009-08-14 11:17:34Z by kib
  
  MFC r196205:
  In nfs_upgrade_vnlock(), assert that the vnode is locked.
  When downgrading, pass LK_RETRY to the vn_lock(), since otherwise
  vn_lock() unlocks the doomed vnode, causing extra unlock.
  
  Approved by:    re (rwatson)
  
  Revision   Changes    Path
  1.163.2.2  +12 -15    src/sys/nfsclient/nfs_subs.c