37c37
< __FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 219056 2011-02-26 14:58:54Z nwhitehorn $");
---
> __FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 219950 2011-03-24 08:37:48Z mav $");
46d45
< #include <sys/conf.h>
166,167c165
< {
< int error;
---
> {
169d166
< struct dumperinfo di;
180,184c177,181
< di.dumper = dp->d_dump;
< di.priv = dp;
< di.blocksize = dp->d_sectorsize;
< di.maxiosize = dp->d_maxsize;
< di.mediaoffset = gkd->offset;
---
> gkd->di.dumper = dp->d_dump;
> gkd->di.priv = dp;
> gkd->di.blocksize = dp->d_sectorsize;
> gkd->di.maxiosize = dp->d_maxsize;
> gkd->di.mediaoffset = gkd->offset;
187,189c184,185
< di.mediasize = gkd->length;
< error = set_dumper(&di);
< g_io_deliver(bp, error);
---
> gkd->di.mediasize = gkd->length;
> g_io_deliver(bp, 0);