From owner-cvs-src-old@FreeBSD.ORG Fri Aug 14 10:59:39 2009 Return-Path: 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 746BC106568D for ; Fri, 14 Aug 2009 10:59:39 +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 62C908FC45 for ; Fri, 14 Aug 2009 10:59:39 +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 n7EAxdmZ055718 for ; Fri, 14 Aug 2009 10:59:39 GMT (envelope-from kib@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7EAxdBY055717 for cvs-src-old@freebsd.org; Fri, 14 Aug 2009 10:59:39 GMT (envelope-from kib@repoman.freebsd.org) Message-Id: <200908141059.n7EAxdBY055717@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to kib@repoman.freebsd.org using -f From: Konstantin Belousov Date: Fri, 14 Aug 2009 10:59:17 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Aug 2009 10:59:39 -0000 kib 2009-08-14 10:59:17 UTC FreeBSD src repository Modified files: sys/nfsclient nfs_subs.c Log: SVN rev 196205 on 2009-08-14 10:59:17Z by kib In nfs_upgrade_vnlock(), assert that the vnode is locked. It is for all pathes, as far as I see and testing seems to confirm it. Comparision of old_lock with LK_SHARED make sense only if vnode is locked by current thread. When downgrading, pass LK_RETRY to the vn_lock(), since otherwise vn_lock() unlocks the doomed vnode, causing extra unlock. Reported and tested by: pho Approved by: re (rwatson) MFC after: 3 weeks Revision Changes Path 1.164 +12 -15 src/sys/nfsclient/nfs_subs.c