7 files changed, 4 insertions, 64 deletions

diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index ebbd2d856256..ecc56765d949 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -20,7 +20,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/config.h>
 #include <linux/timer.h>
 #include <linux/sched.h>
 #include <linux/list.h>
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 3edb3477f987..d13bb15a8a02 100644
--- 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>
 
@@ -68,14 +67,12 @@ static int dm_hash_init(void)
 {
         init_buckets(_name_buckets);
         init_buckets(_uuid_buckets);
-        devfs_mk_dir(DM_DIR);
         return 0;
 }
 
 static void dm_hash_exit(void)
 {
         dm_hash_remove_all(0);
-        devfs_remove(DM_DIR);
 }
 
 /*-----------------------------------------------------------------
@@ -172,25 +169,6 @@ static void free_cell(struct hash_cell *hc)
 }
 
 /*
- * devfs stuff.
- */
-static int register_with_devfs(struct hash_cell *hc)
-{
-        struct gendisk *disk = dm_disk(hc->md);
-
-        devfs_mk_bdev(MKDEV(disk->major, disk->first_minor),
-                      S_IFBLK | S_IRUSR | S_IWUSR | S_IRGRP,
-                      DM_DIR "/%s", hc->name);
-        return 0;
-}
-
-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.
  */
@@ -226,7 +204,6 @@ static int dm_hash_insert(const char *name, const char *uuid, struct mapped_devi
                 }
                 list_add(&cell->uuid_list, _uuid_buckets + hash_str(uuid));
         }
-        register_with_devfs(cell);
         dm_get(md);
         dm_set_mdptr(md, cell);
         up_write(&_hash_lock);
@@ -246,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);
@@ -342,16 +318,11 @@ 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;
         list_add(&hc->name_list, _name_buckets + hash_str(new_name));
 
-        /* rename the device node in devfs */
-        register_with_devfs(hc);
-
         /*
          * Wake up any dm event waiters.
          */
@@ -1501,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
 };
 
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 8eea0ddbf5ec..1d0fafda0f76 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/blkdev.h>
-#include <linux/config.h>
 #include <linux/ctype.h>
 #include <linux/device-mapper.h>
 #include <linux/fs.h>
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 3ed2e53b9eb6..c99bf9f01759 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -167,7 +167,7 @@ static void local_exit(void)
         bioset_free(dm_set);
 
         if (unregister_blkdev(_major, _name) < 0)
-                DMERR("devfs_unregister_blkdev failed");
+                DMERR("unregister_blkdev failed");
 
         _major = 0;
 
diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c
index 73ab875fb158..f1db6eff4857 100644
--- a/drivers/md/kcopyd.c
+++ b/drivers/md/kcopyd.c
@@ -12,7 +12,6 @@
 #include <asm/atomic.h>
 
 #include <linux/blkdev.h>
-#include <linux/config.h>
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/list.h>
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 306268ec99ff..2fe32c261922 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -33,13 +33,11 @@
 */
 
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/kthread.h>
 #include <linux/linkage.h>
 #include <linux/raid/md.h>
 #include <linux/raid/bitmap.h>
 #include <linux/sysctl.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/buffer_head.h> /* for invalidate_bdev */
 #include <linux/suspend.h>
 #include <linux/poll.h>
@@ -2911,13 +2909,10 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data)
         }
         disk->major = MAJOR(dev);
         disk->first_minor = unit << shift;
-        if (partitioned) {
+        if (partitioned)
                 sprintf(disk->disk_name, "md_d%d", unit);
-                sprintf(disk->devfs_name, "md/d%d", unit);
-        } else {
+        else
                 sprintf(disk->disk_name, "md%d", unit);
-                sprintf(disk->devfs_name, "md/%d", unit);
-        }
         disk->fops = &md_fops;
         disk->private_data = mddev;
         disk->queue = mddev->queue;
@@ -5538,8 +5533,6 @@ static void md_geninit(void)
 
 static int __init md_init(void)
 {
-        int minor;
-
         printk(KERN_INFO "md: md driver %d.%d.%d MAX_MD_DEVS=%d,"
                         " MD_SB_DISKS=%d\n",
                         MD_MAJOR_VERSION, MD_MINOR_VERSION,
@@ -5553,23 +5546,11 @@ static int __init md_init(void)
                 unregister_blkdev(MAJOR_NR, "md");
                 return -1;
         }
-        devfs_mk_dir("md");
         blk_register_region(MKDEV(MAJOR_NR, 0), MAX_MD_DEVS, THIS_MODULE,
                                 md_probe, NULL, NULL);
         blk_register_region(MKDEV(mdp_major, 0), MAX_MD_DEVS<<MdpMinorShift, THIS_MODULE,
                             md_probe, NULL, NULL);
 
-        for (minor=0; minor < MAX_MD_DEVS; ++minor)
-                devfs_mk_bdev(MKDEV(MAJOR_NR, minor),
-                                S_IFBLK|S_IRUSR|S_IWUSR,
-                                "md/%d", minor);
-
-        for (minor=0; minor < MAX_MD_DEVS; ++minor)
-                devfs_mk_bdev(MKDEV(mdp_major, minor<<MdpMinorShift),
-                              S_IFBLK|S_IRUSR|S_IWUSR,
-                              "md/mdp%d", minor);
-
-
         register_reboot_notifier(&md_notifier);
         raid_table_header = register_sysctl_table(raid_root_table, 1);
 
@@ -5625,15 +5606,9 @@ static __exit void md_exit(void)
 {
         mddev_t *mddev;
         struct list_head *tmp;
-        int i;
+
         blk_unregister_region(MKDEV(MAJOR_NR,0), MAX_MD_DEVS);
         blk_unregister_region(MKDEV(mdp_major,0), MAX_MD_DEVS << MdpMinorShift);
-        for (i=0; i < MAX_MD_DEVS; i++)
-                devfs_remove("md/%d", i);
-        for (i=0; i < MAX_MD_DEVS; i++)
-                devfs_remove("md/d%d", i);
-
-        devfs_remove("md");
 
         unregister_blkdev(MAJOR_NR,"md");
         unregister_blkdev(mdp_major, "mdp");
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index f920e50ea124..7433871f4b3a 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -19,7 +19,6 @@
  */
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
@@ -2827,7 +2826,6 @@ static inline sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *ski
         struct stripe_head *sh;
         int pd_idx;
         int raid_disks = conf->raid_disks;
-        int data_disks = raid_disks - conf->max_degraded;
         sector_t max_sector = mddev->size << 1;
         int sync_blocks;
         int still_degraded = 0;