diff -X /home/ecashin/aoe-2.6-devel/wds/aoe6-30/../aoe6-30.changes/dontdiff -uprN 1/linux/drivers/block/aoe/aoeblk.c 2/linux/drivers/block/aoe/aoeblk.c
--- 1/linux/drivers/block/aoe/aoeblk.c	2006-06-02 15:33:25.000000000 -0400
+++ 2/linux/drivers/block/aoe/aoeblk.c	2006-06-06 18:07:24.000000000 -0400
@@ -243,6 +243,7 @@ aoeblk_gdalloc(void *vp)
 	gd->capacity = d->ssize;
 	snprintf(gd->disk_name, sizeof gd->disk_name, "etherd/e%ld.%ld",
 		d->aoemajor, d->aoeminor);
+	strncpy(gd->devfs_name, gd->disk_name, sizeof gd->devfs_name);
 
 	gd->queue = &d->blkq;
 	d->gd = gd;
diff -X /home/ecashin/aoe-2.6-devel/wds/aoe6-30/../aoe6-30.changes/dontdiff -uprN 1/linux/drivers/block/aoe/aoemain.c 2/linux/drivers/block/aoe/aoemain.c
--- 1/linux/drivers/block/aoe/aoemain.c	2006-06-02 15:33:25.000000000 -0400
+++ 2/linux/drivers/block/aoe/aoemain.c	2006-06-06 18:09:53.000000000 -0400
@@ -9,6 +9,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/devfs_fs_kernel.h>
 #include "aoe.h"
 
 MODULE_LICENSE("GPL");
@@ -87,6 +88,7 @@ aoe_exit(void)
 	aoechr_exit();
 	aoedev_exit();
 	aoeblk_exit();		/* free cache after de-allocating bufs */
+	devfs_remove("etherd");
 }
 
 static int __init
@@ -94,6 +96,8 @@ aoe_init(void)
 {
 	int ret;
 
+	devfs_mk_dir("etherd");
+
 	ret = aoedev_init();
 	if (ret)
 		return ret;
@@ -124,6 +128,7 @@ aoe_init(void)
 	aoechr_exit();
  chr_fail:
 	aoedev_exit();
+	devfs_remove("etherd");
 	
 	iprintk("initialisation failure.\n");
 	return ret;