svn commit: r187053 - head/sys/geom
Edward Tomasz Napierala
trasz at FreeBSD.org
Sun Jan 11 05:51:05 PST 2009
Author: trasz
Date: Sun Jan 11 13:51:04 2009
New Revision: 187053
URL: http://svn.freebsd.org/changeset/base/187053
Log:
Prevent a panic that happens on SMP machines when removing a disk with
many writes queued up.
Reviewed by: phk, scottl
Approved by: rwatson (mentor)
Sponsored by: FreeBSD Foundation
Modified:
head/sys/geom/geom_vfs.c
Modified: head/sys/geom/geom_vfs.c
==============================================================================
--- head/sys/geom/geom_vfs.c Sun Jan 11 12:04:18 2009 (r187052)
+++ head/sys/geom/geom_vfs.c Sun Jan 11 13:51:04 2009 (r187053)
@@ -71,6 +71,16 @@ g_vfs_done(struct bio *bip)
struct buf *bp;
int vfslocked;
+ /*
+ * Provider ('bio_to') could have withered away sometime
+ * between incrementing the 'nend' in g_io_deliver() and now,
+ * making 'bio_to' a dangling pointer. We cannot do that
+ * in g_wither_geom(), as it would require going over
+ * the 'g_bio_run_up' list, resetting the pointer.
+ */
+ if (bip->bio_from->provider == NULL)
+ bip->bio_to = NULL;
+
if (bip->bio_error) {
printf("g_vfs_done():");
g_print_bio(bip);
@@ -136,7 +146,7 @@ g_vfs_orphan(struct g_consumer *cp)
g_detach(cp);
/*
- * Do not destroy the geom. Filesystem will do this during unmount.
+ * Do not destroy the geom. Filesystem will do that during unmount.
*/
}
More information about the svn-src-head
mailing list