From owner-freebsd-current@FreeBSD.ORG Thu Feb 12 17:58:10 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA31316A4CF for ; Thu, 12 Feb 2004 17:58:10 -0800 (PST) Received: from mailout2.pacific.net.au (mailout2.pacific.net.au [61.8.0.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41D4243D2F for ; Thu, 12 Feb 2004 17:58:10 -0800 (PST) (envelope-from bde@zeta.org.au) Received: from mailproxy1.pacific.net.au (mailproxy1.pacific.net.au [61.8.0.86])i1D1w85O001868; Fri, 13 Feb 2004 12:58:08 +1100 Received: from gamplex.bde.org (katana.zip.com.au [61.8.7.246]) i1D1w4i1023697; Fri, 13 Feb 2004 12:58:06 +1100 Date: Fri, 13 Feb 2004 12:58:04 +1100 (EST) From: Bruce Evans X-X-Sender: bde@gamplex.bde.org To: Jun Kuriyama In-Reply-To: <7mptcjzxbb.wl@black.imgsrc.co.jp> Message-ID: <20040213125640.D25887@gamplex.bde.org> References: <7m65ed2j50.wl@black.imgsrc.co.jp> <20040213060939.Q24610@gamplex.bde.org> <7mptcjzxbb.wl@black.imgsrc.co.jp> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Kirk McKusick cc: Current Subject: Re: acquiring duplicate lock of same type: "vnode interlock" X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Feb 2004 01:58:10 -0000 On Fri, 13 Feb 2004, Jun Kuriyama wrote: > At Fri, 13 Feb 2004 06:16:21 +1100 (EST), > Bruce Evans wrote: > > [about some style bugs :)] > > Thanks! Is this better than I committed? > > Index: ffs_snapshot.c > =================================================================== > RCS file: /home/ncvs/src/sys/ufs/ffs/ffs_snapshot.c,v > retrieving revision 1.78 > diff -u -r1.78 ffs_snapshot.c > --- ffs_snapshot.c 12 Feb 2004 08:52:08 -0000 1.78 > +++ ffs_snapshot.c 12 Feb 2004 23:33:07 -0000 > @@ -488,7 +488,9 @@ > VI_LOCK(devvp); > snaphead = &devvp->v_rdev->si_snapshots; > if ((xp = TAILQ_FIRST(snaphead)) != NULL) { > - struct lock *lkp = ITOV(xp)->v_vnlock; > + struct lock *lkp; > + > + lkp = ITOV(xp)->v_vnlock; > VI_UNLOCK(devvp); > VI_LOCK(vp); > vp->v_vnlock = lkp; > [... similarly] Yes. Bruce