From owner-freebsd-current@FreeBSD.ORG Thu Feb 12 15:34:51 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 0051716A4CE for ; Thu, 12 Feb 2004 15:34:51 -0800 (PST) Received: from white.imgsrc.co.jp (ns.imgsrc.co.jp [210.226.20.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7E2643D1D for ; Thu, 12 Feb 2004 15:34:50 -0800 (PST) (envelope-from kuriyama@imgsrc.co.jp) Received: from localhost (localhost [127.0.0.1]) by white.imgsrc.co.jp (Postfix) with ESMTP id 8E1202840ED; Fri, 13 Feb 2004 08:34:49 +0900 (JST) Received: from black.imgsrc.co.jp (black.imgsrc.co.jp [IPv6:2001:218:422:2::130]) by white.imgsrc.co.jp (Postfix) with ESMTP id 692222840D5; Fri, 13 Feb 2004 08:34:48 +0900 (JST) Received: from black.imgsrc.co.jp (black.imgsrc.co.jp [IPv6:2001:218:422:2::130]) by black.imgsrc.co.jp (Postfix) with ESMTP id 47A0F1E4620; Fri, 13 Feb 2004 08:34:48 +0900 (JST) Date: Fri, 13 Feb 2004 08:34:48 +0900 Message-ID: <7mptcjzxbb.wl@black.imgsrc.co.jp> From: Jun Kuriyama To: Bruce Evans In-Reply-To: <20040213060939.Q24610@gamplex.bde.org> References: <7m65ed2j50.wl@black.imgsrc.co.jp> <20040213060939.Q24610@gamplex.bde.org> User-Agent: Wanderlust/2.10.1 (Watching The Wheels) SEMI/1.14.5 (Awara-Onsen) FLIM/1.14.5 (Demachiyanagi) APEL/10.6 Emacs/21.3 (i386--freebsd) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen") Content-Type: text/plain; charset=US-ASCII X-Virus-Scanned: by AMaViS snapshot-20020531 X-Mailman-Approved-At: Fri, 13 Feb 2004 05:23:30 -0800 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: Thu, 12 Feb 2004 23:34:51 -0000 At Fri, 13 Feb 2004 06:16:21 +1100 (EST), Bruce Evans wrote: > > @@ -488,9 +488,10 @@ > > VI_LOCK(devvp); > > snaphead = &devvp->v_rdev->si_snapshots; > > if ((xp = TAILQ_FIRST(snaphead)) != NULL) { > > - VI_LOCK(vp); > > - vp->v_vnlock = ITOV(xp)->v_vnlock; > > + struct lock *lkp = ITOV(xp)->v_vnlock; > > (1) Nested declaration. > (2) Initialization in declaration. > (3) No blank line after declaration. 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; @@ -1794,7 +1796,9 @@ */ VI_LOCK(devvp); 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; -- Jun Kuriyama // IMG SRC, Inc. // FreeBSD Project