Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 Apr 2007 20:13:59 +0200
From:      Max Laier <max@love2party.net>
To:        freebsd-current@freebsd.org
Cc:        freebsd-fs@freebsd.org, Dag-Erling =?iso-8859-1?q?Sm=F8rgrav?= <des@des.no>, Pawel Jakub Dawidek <pjd@freebsd.org>
Subject:   Re: ZFS committed to the FreeBSD base.
Message-ID:  <200704082014.06848.max@love2party.net>
In-Reply-To: <200704081910.42852.max@love2party.net>
References:  <20070406025700.GB98545@garage.freebsd.pl> <86k5wo55s0.fsf@dwp.des.no> <200704081910.42852.max@love2party.net>

next in thread | previous in thread | raw e-mail | index | archive | help
--nextPart1730977.T05y8ciJiq
Content-Type: multipart/mixed;
  boundary="Boundary-01=_pDTGGLUrWjPd/IY"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--Boundary-01=_pDTGGLUrWjPd/IY
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

On Sunday 08 April 2007 19:10, Max Laier wrote:
> On Saturday 07 April 2007 21:43, Dag-Erling Sm=F8rgrav wrote:
> > Pawel Jakub Dawidek <pjd@FreeBSD.org> writes:
> > > Limitations.
> > >
> > >   Currently ZFS is only compiled as kernel module and is only
> > > available for i386 architecture. Amd64 should be available very
> > > soon, the other archs will come later, as we implement needed
> > > atomic operations.
> >
> > ZFS is now also available on pc98 and amd64.
>
> panic: lock "zfs:&zap->zap_f.zap_num_entries_mtx" 0xffffff006582c260
> already initialized
>
> While dump/restoreing /usr to zfs.  kgdb trace attached.  Let me know
> if you need further information.

The attached diff lets me survive the dump/restore.  Not sure if this is=20
the right fix, but seems like the union messes with mutex initialization.

=2D-=20
/"\  Best regards,                      | mlaier@freebsd.org
\ /  Max Laier                          | ICQ #67774661
 X   http://pf4freebsd.love2party.net/  | mlaier@EFnet
/ \  ASCII Ribbon Campaign              | Against HTML Mail and News

--Boundary-01=_pDTGGLUrWjPd/IY
Content-Type: text/x-diff;
  charset="iso-8859-6";
  name="zfs.dump.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="zfs.dump.diff"

Index: zap.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/store/mlaier/fcvs/src/sys/contrib/opensolaris/uts/common/fs/=
zfs/zap.c,v
retrieving revision 1.1
diff -u -r1.1 zap.c
=2D-- zap.c	6 Apr 2007 01:09:02 -0000	1.1
+++ zap.c	8 Apr 2007 17:48:07 -0000
@@ -84,6 +84,9 @@
 	(void) dmu_buf_update_user(zap->zap_dbuf, zap, zap,
 	    &zap->zap_f.zap_phys, zap_evict);
=20
+#ifdef _KERNEL
+	memset(&zap->zap_f.zap_num_entries_mtx, 0, sizeof(struct mtx));
+#endif
 	mutex_init(&zap->zap_f.zap_num_entries_mtx, NULL, MUTEX_DEFAULT, 0);
 	zap->zap_f.zap_block_shift =3D highbit(zap->zap_dbuf->db_size) - 1;
=20

--Boundary-01=_pDTGGLUrWjPd/IY--

--nextPart1730977.T05y8ciJiq
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (FreeBSD)

iD8DBQBGGTDuXyyEoT62BG0RAjxkAJ9K1rP5fze+6TvKCSpiDtEJ/Ob7QgCeN0nm
2IlZdXUnKaAV7JG4Ya4a3IY=
=IuYE
-----END PGP SIGNATURE-----

--nextPart1730977.T05y8ciJiq--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704082014.06848.max>