From owner-freebsd-current@FreeBSD.ORG Mon Aug 23 21:13:01 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45E3F10656A3; Mon, 23 Aug 2010 21:13:01 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id B5E248FC08; Mon, 23 Aug 2010 21:13:00 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id o7NLCwUB007459 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 24 Aug 2010 00:12:58 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id o7NLCw9p019952; Tue, 24 Aug 2010 00:12:58 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id o7NLCvuH019951; Tue, 24 Aug 2010 00:12:57 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 24 Aug 2010 00:12:57 +0300 From: Kostik Belousov To: Peter Holm Message-ID: <20100823211257.GI2396@deviant.kiev.zoral.com.ua> References: <4C7011B9.4020902@protected-networks.net> <20100822132104.GA7300@x2.osted.lan> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3SKAfNXaYt19qiWj" Content-Disposition: inline In-Reply-To: <20100822132104.GA7300@x2.osted.lan> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean Cc: Michael Butler , Jeff Roberson , current@freebsd.org Subject: Re: softupdate with journal panic X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 23 Aug 2010 21:13:01 -0000 --3SKAfNXaYt19qiWj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Aug 22, 2010 at 03:21:04PM +0200, Peter Holm wrote: > On Sat, Aug 21, 2010 at 01:49:45PM -0400, Michael Butler wrote: > > While updating sysutils/coreutils port on -current as of this morning > > (SVN r211550), I noted a panic during the directory rename config test. > >=20 >=20 > Your problem seems identical to this report: >=20 > http://docs.freebsd.org/cgi/mid.cgi?AANLkTinPjiOV21kDLZYV5WScrhLMN7DY8E8j= VHWPU5mC >=20 I believe that dotdotremref in this case is legitimately NULL. With this assumption, the following patch would help. diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index b666c0f..65e5255 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -6770,7 +6794,8 @@ cancel_diradd(dap, dirrem, jremref, dotremref, dotdot= remref) mkdir->md_jaddref =3D NULL; if (mkdir->md_state & MKDIR_PARENT) { if (cancel_jaddref(jaddref, NULL, - &dirrem->dm_jwork) =3D=3D 0) { + &dirrem->dm_jwork) =3D=3D 0 && + dotdotremref !=3D NULL) { free_jremref(dotdotremref); dotdotremref =3D NULL; } --3SKAfNXaYt19qiWj Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (FreeBSD) iEYEARECAAYFAkxy5FgACgkQC3+MBN1Mb4hzZgCgsd5xo26VcO1Wv1IVtbT+tKKU 8U0AoI9l6QOtkbbysUrxxCBTILLDtUbW =1nI7 -----END PGP SIGNATURE----- --3SKAfNXaYt19qiWj--