From owner-svn-src-head@FreeBSD.ORG Mon Nov 3 18:46:04 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D12610656B8; Mon, 3 Nov 2008 18:46:03 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net [IPv6:2001:470:1f10:75::2]) by mx1.freebsd.org (Postfix) with ESMTP id C5BA78FC26; Mon, 3 Nov 2008 18:46:02 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [IPv6:::1]) (authenticated bits=0) by server.baldwin.cx (8.14.3/8.14.3) with ESMTP id mA3IjdRR091877; Mon, 3 Nov 2008 13:45:56 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Robert Watson Date: Mon, 3 Nov 2008 12:51:32 -0500 User-Agent: KMail/1.9.7 References: <200811022022.mA2KMOCC047394@svn.freebsd.org> In-Reply-To: <200811022022.mA2KMOCC047394@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200811031251.32904.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [IPv6:::1]); Mon, 03 Nov 2008 13:45:57 -0500 (EST) X-Virus-Scanned: ClamAV 0.93.1/8559/Mon Nov 3 11:41:26 2008 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=4.2 tests=BAYES_00,NO_RELAYS autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r184568 - head/sys/netsmb X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Nov 2008 18:46:04 -0000 On Sunday 02 November 2008 03:22:24 pm Robert Watson wrote: > Author: rwatson > Date: Sun Nov 2 20:22:24 2008 > New Revision: 184568 > URL: http://svn.freebsd.org/changeset/base/184568 > > Log: > smb_vc_put() requires that the passed vcp be locked, so lock it before > dropping the connection when the requested service isn't available, or > we may try to release a lock that isn't locked. > > This prevents an assertion failure when trying to mount a non-present > share using smbfs with INVARIANTS; a lock order reversal warning that > immediately follows is not yet fixed. > > Reported by: attilio > MFC after: 3 days > > Modified: > head/sys/netsmb/smb_conn.c > > Modified: head/sys/netsmb/smb_conn.c > ============================================================================== > --- head/sys/netsmb/smb_conn.c Sun Nov 2 19:48:15 2008 (r184567) > +++ head/sys/netsmb/smb_conn.c Sun Nov 2 20:22:24 2008 (r184568) > @@ -218,8 +218,10 @@ out: > smb_sm_unlockvclist(td); > if (error == 0) > *vcpp = vcp; > - else if (vcp) > + else if (vcp) { > + smb_vc_lock(vcp, LK_EXCLUSIVE, scred->scr_td); > smb_vc_put(vcp, scred); > + } > return error; > } Can't you just do 'smb_vc_rele()' to avoid pointlessly acquiring the lock only to drop it again? Just as with vput/vrele for vnodes, smb_XX_rele() drops the reference count and smb_xx_put() is equivalent to 'smb_XX_rele() + lockmgr(LK_RELEASE)' -- John Baldwin