Date: Sat, 14 Apr 2007 16:03:58 +0200 From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> Cc: freebsd-current@freebsd.org Subject: Re: zdb patch Message-ID: <20070414140358.GG10527@garage.freebsd.pl> In-Reply-To: <626eb4530704140701n3b06df02o58f288baad4cf3d1@mail.gmail.com> References: <86slb3t74o.wl%simokawa@FreeBSD.ORG> <20070414134653.GF10527@garage.freebsd.pl> <626eb4530704140701n3b06df02o58f288baad4cf3d1@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Sat, Apr 14, 2007 at 11:01:35PM +0900, Hidetoshi Shimokawa wrote: > On 4/14/07, Pawel Jakub Dawidek <pjd@freebsd.org> wrote: > >On Sat, Apr 14, 2007 at 10:31:19PM +0900, Hidetoshi Shimokawa wrote: > >> Here is a patch for zdb. > >> Now we can 'zdb -u pool' :-) > >> > >> ==== //depot/user/simokawa/firewire/contrib/opensolaris/lib/libzpool/common/kernel.c#2 - /home/p4/firewire/contrib/opensolaris/lib/libzpool/common/kernel.c ==== > >> @@ -38,6 +38,7 @@ > >> #include <sys/zfs_context.h> > >> #include <sys/zmod.h> > >> #include <sys/utsname.h> > >> +#include <sys/disk.h> > >> > >> /* > >> * Emulation of kernel services in userland. > >> @@ -291,7 +292,11 @@ > >> > >> ASSERT(abstime > 0); > >> top: > >> +#if 0 > >> delta = abstime - lbolt; > >> +#else /* for compatibility with FreeBSD kernel */ > >> + delta = abstime; > >> +#endif > > > >What is this change for? It works ok without it here. > > It is necessary for userland because of your change 104486. > (see p4 describe 104486) > > Without above patch, cv_timedwait() never sleeps and arc_reclaim_thread > never releases the lock. Right... How can I reproduce the problem, because ztest seems to work just fine? BTW. Please commit this change as well, but just remove ' - lbolt' and forget about this '#if 0'. -- Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQFGIN9OForvXbEpPzQRAqBmAJ4wpBXPninR+TNkv9kAdtjN309s9QCg857b oYzfkK5HxmzL1nt+prG9zqA= =nCPz -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070414140358.GG10527>