--- a/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h Sun Oct 08 21:26:45 2006 -0700
+++ b/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h Mon Oct 09 10:56:01 2006 -0700
@@ -31,7 +31,6 @@
#include <sys/cred.h>
#include <sys/dmu.h>
#include <sys/zio.h>
-#include <sys/zvol.h>
#ifdef __cplusplus
extern "C" {
@@ -78,6 +77,7 @@
uint8_t drr_checksum;
uint8_t drr_compress;
uint8_t drr_pad[6];
+ /* bonus content follows */
} drr_object;
struct drr_freeobjects {
uint64_t drr_firstobj;
@@ -89,6 +89,7 @@
uint32_t drr_pad;
uint64_t drr_offset;
uint64_t drr_length;
+ /* content follows */
} drr_write;
struct drr_free {
uint64_t drr_object;
@@ -127,7 +128,6 @@
uint64_t zc_dev;
uint64_t zc_objset_type;
dmu_objset_stats_t zc_objset_stats;
- zvol_stats_t zc_vol_stats;
struct drr_begin zc_begin_record;
zinject_record_t zc_inject_record;
zbookmark_t zc_bookmark;