Date: Thu, 10 Dec 2009 18:38:40 +0000 (UTC) From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs vdev_geom.c zvol.c Message-ID: <200912101839.nBAId1Fm038702@repoman.freebsd.org>
index | next in thread | raw e-mail
pjd 2009-12-10 18:38:40 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_8)
sys/cddl/contrib/opensolaris/uts/common/fs/zfs vdev_geom.c
zvol.c
Log:
SVN rev 200362 on 2009-12-10 18:38:40Z by pjd
MFC r200124,r200126,
r200124:
Avoid using additional variable for storing an error if we are not going
to do anything with it.
r200126:
Fix deadlock when ZVOLs are present and we are replacing dead component or
calling scrub when pool is in a degraded state. It will try to taste ZVOLs,
which will lead to deadlock, as ZVOL will try to acquire the same locks as
replace/scrub is holding already.
We can't simply skip provider based on their GEOM class, because ZVOL can have
providers build on top of it and we need to skip those as well.
We do it by asking for ZFS::iszvol attribute. Any ZVOL-based provider will give
us positive answer and we have to skip those providers.
This way we remove possibility to create ZFS pools on top of ZVOLs, but it is
not very useful anyway.
I believe deadlock is still possible in some very complex situations like when
we have MD provider on top of UFS file on top of ZVOL. When we try to replace
dead component in the pool mentioned ZVOL is based on, there might be a
deadlock when ZFS will try to taste MD provider. There is no easy way to detect
that, but it isn't very common.
r200125,r200158:
Fix order of looking for providers.
Before r200125 the order of looking for providers was wrong. It was:
1. Find provider by name.
2. Find provider by guid.
3. Find provider by name and guid.
Where it should have been:
1. Find provider by name and guid.
2. Find provider by guid.
3. Find provider by name.
Revision Changes Path
1.8.2.3 +9 -5 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
1.6.2.2 +4 -1 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912101839.nBAId1Fm038702>