--- a/usr/src/uts/common/fs/zfs/dmu_send.c	Mon Nov 30 15:30:52 2009 -0500
+++ b/usr/src/uts/common/fs/zfs/dmu_send.c	Mon Nov 30 11:36:36 2009 -0800
@@ -758,12 +758,12 @@
  * guid of the dataset with the referenced data.
  */
 int
-find_ds_by_guid(char *name, void *arg)
+find_ds_by_guid(const char *name, void *arg)
 {
+	avl_tree_t *guid_map = arg;
 	dsl_dataset_t *ds, *snapds;
-	avl_tree_t *guid_map = arg;
 	guid_map_entry_t *gmep;
-	dsl_pool_t	*dp;
+	dsl_pool_t *dp;
 	int err;
 	uint64_t lastobj, firstobj;