Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[~andy/linux] / drivers / md / dm-ioctl.c

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 6e1b51d748ac8afd35a3df828f7661a51d76800c..d13bb15a8a02981f69706048d32bfc64b83b73c1 100644 (file)
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -13,7 +13,6 @@
 #include <linux/init.h>
 #include <linux/wait.h>
 #include <linux/slab.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/dm-ioctl.h>
 #include <linux/hdreg.h>
 
@@ -74,7 +73,6 @@ static int dm_hash_init(void)
 static void dm_hash_exit(void)
 {
        dm_hash_remove_all(0);
-       devfs_remove(DM_DIR);
 }
 
 /*-----------------------------------------------------------------
@@ -170,15 +168,6 @@ static void free_cell(struct hash_cell *hc)
        }
 }
 
-/*
- * devfs stuff.
- */
-static int unregister_with_devfs(struct hash_cell *hc)
-{
-       devfs_remove(DM_DIR"/%s", hc->name);
-       return 0;
-}
-
 /*
  * The kdev_t and uuid of a device can never change once it is
  * initially inserted.
@@ -234,7 +223,6 @@ static void __hash_remove(struct hash_cell *hc)
        /* remove from the dev hash */
        list_del(&hc->uuid_list);
        list_del(&hc->name_list);
-       unregister_with_devfs(hc);
        dm_set_mdptr(hc->md, NULL);
 
        table = dm_get_table(hc->md);
@@ -330,8 +318,6 @@ static int dm_hash_rename(const char *old, const char *new)
        /*
         * rename and move the name cell.
         */
-       unregister_with_devfs(hc);
-
        list_del(&hc->name_list);
        old_name = hc->name;
        hc->name = new_name;
@@ -1486,7 +1472,6 @@ static struct file_operations _ctl_fops = {
 static struct miscdevice _dm_misc = {
        .minor          = MISC_DYNAMIC_MINOR,
        .name           = DM_NAME,
-       .devfs_name     = "mapper/control",
        .fops           = &_ctl_fops
 };