From owner-freebsd-fs@FreeBSD.ORG  Thu Aug  7 23:09:13 2008
Return-Path: <owner-freebsd-fs@FreeBSD.ORG>
Delivered-To: freebsd-fs@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 13B2E1065677
	for <freebsd-fs@freebsd.org>; Thu,  7 Aug 2008 23:09:13 +0000 (UTC)
	(envelope-from des@des.no)
Received: from tim.des.no (tim.des.no [194.63.250.121])
	by mx1.freebsd.org (Postfix) with ESMTP id BCB4B8FC1D
	for <freebsd-fs@freebsd.org>; Thu,  7 Aug 2008 23:09:12 +0000 (UTC)
	(envelope-from des@des.no)
Received: from ds4.des.no (des.no [84.49.246.2])
	by smtp.des.no (Postfix) with ESMTP id 6A8FB2089;
	Fri,  8 Aug 2008 01:09:11 +0200 (CEST)
Received: by ds4.des.no (Postfix, from userid 1001)
	id 59D548449F; Fri,  8 Aug 2008 01:09:11 +0200 (CEST)
From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no>
To: Kostik Belousov <kostikbel@gmail.com>
References: <200808061020.m76AK5NI013323@freefall.freebsd.org>
	<20080806133441.GM97161@deviant.kiev.zoral.com.ua>
	<e7799ca20808060652y12525a12ne31cc44f540d7a7a@mail.gmail.com>
	<20080806144820.GO97161@deviant.kiev.zoral.com.ua>
Date: Fri, 08 Aug 2008 01:09:11 +0200
In-Reply-To: <20080806144820.GO97161@deviant.kiev.zoral.com.ua> (Kostik
	Belousov's message of "Wed, 6 Aug 2008 17:48:20 +0300")
Message-ID: <86zlnoe82w.fsf@ds4.des.no>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Cc: freebsd-fs@freebsd.org, Mateusz Guzik <mjguzik@gmail.com>,
	bug-followup@freebsd.org
Subject: Re: kern/126287: [ufs] [panic] Kernel panics while mounting an UFS
	filesystem with snapshot enabled
X-BeenThere: freebsd-fs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Filesystems <freebsd-fs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-fs>
List-Post: <mailto:freebsd-fs@freebsd.org>
List-Help: <mailto:freebsd-fs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Aug 2008 23:09:13 -0000

Kostik Belousov <kostikbel@gmail.com> writes:
> @@ -169,7 +169,8 @@ ffs_mount(struct mount *mp, struct thread *td)
>  		 * persist "snapshot" in the options list.
>  		 */
>  		vfs_deleteopt(mp->mnt_optnew, "snapshot");
> -		vfs_deleteopt(mp->mnt_opt, "snapshot");
> +		if (mp->mnt_opt !=3D NULL)
> +			vfs_deleteopt(mp->mnt_opt, "snapshot");
>  	}
>=20=20
>  	MNT_ILOCK(mp);

I would suggest also adding a KASSERT to vfs_deleteopt().

DES
--=20
Dag-Erling Sm=C3=B8rgrav - des@des.no