diff options
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/dm-ioctl.c | 13 | ||||
-rw-r--r-- | drivers/md/md.c | 8 |
2 files changed, 1 insertions, 20 deletions
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index 6e1b51d748ac..361d50b6469f 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c | |||
@@ -74,7 +74,6 @@ static int dm_hash_init(void) | |||
74 | static void dm_hash_exit(void) | 74 | static void dm_hash_exit(void) |
75 | { | 75 | { |
76 | dm_hash_remove_all(0); | 76 | dm_hash_remove_all(0); |
77 | devfs_remove(DM_DIR); | ||
78 | } | 77 | } |
79 | 78 | ||
80 | /*----------------------------------------------------------------- | 79 | /*----------------------------------------------------------------- |
@@ -171,15 +170,6 @@ static void free_cell(struct hash_cell *hc) | |||
171 | } | 170 | } |
172 | 171 | ||
173 | /* | 172 | /* |
174 | * devfs stuff. | ||
175 | */ | ||
176 | static int unregister_with_devfs(struct hash_cell *hc) | ||
177 | { | ||
178 | devfs_remove(DM_DIR"/%s", hc->name); | ||
179 | return 0; | ||
180 | } | ||
181 | |||
182 | /* | ||
183 | * The kdev_t and uuid of a device can never change once it is | 173 | * The kdev_t and uuid of a device can never change once it is |
184 | * initially inserted. | 174 | * initially inserted. |
185 | */ | 175 | */ |
@@ -234,7 +224,6 @@ static void __hash_remove(struct hash_cell *hc) | |||
234 | /* remove from the dev hash */ | 224 | /* remove from the dev hash */ |
235 | list_del(&hc->uuid_list); | 225 | list_del(&hc->uuid_list); |
236 | list_del(&hc->name_list); | 226 | list_del(&hc->name_list); |
237 | unregister_with_devfs(hc); | ||
238 | dm_set_mdptr(hc->md, NULL); | 227 | dm_set_mdptr(hc->md, NULL); |
239 | 228 | ||
240 | table = dm_get_table(hc->md); | 229 | table = dm_get_table(hc->md); |
@@ -330,8 +319,6 @@ static int dm_hash_rename(const char *old, const char *new) | |||
330 | /* | 319 | /* |
331 | * rename and move the name cell. | 320 | * rename and move the name cell. |
332 | */ | 321 | */ |
333 | unregister_with_devfs(hc); | ||
334 | |||
335 | list_del(&hc->name_list); | 322 | list_del(&hc->name_list); |
336 | old_name = hc->name; | 323 | old_name = hc->name; |
337 | hc->name = new_name; | 324 | hc->name = new_name; |
diff --git a/drivers/md/md.c b/drivers/md/md.c index ee7320b4a30e..9fc2314b58d9 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -5611,15 +5611,9 @@ static __exit void md_exit(void) | |||
5611 | { | 5611 | { |
5612 | mddev_t *mddev; | 5612 | mddev_t *mddev; |
5613 | struct list_head *tmp; | 5613 | struct list_head *tmp; |
5614 | int i; | 5614 | |
5615 | blk_unregister_region(MKDEV(MAJOR_NR,0), MAX_MD_DEVS); | 5615 | blk_unregister_region(MKDEV(MAJOR_NR,0), MAX_MD_DEVS); |
5616 | blk_unregister_region(MKDEV(mdp_major,0), MAX_MD_DEVS << MdpMinorShift); | 5616 | blk_unregister_region(MKDEV(mdp_major,0), MAX_MD_DEVS << MdpMinorShift); |
5617 | for (i=0; i < MAX_MD_DEVS; i++) | ||
5618 | devfs_remove("md/%d", i); | ||
5619 | for (i=0; i < MAX_MD_DEVS; i++) | ||
5620 | devfs_remove("md/d%d", i); | ||
5621 | |||
5622 | devfs_remove("md"); | ||
5623 | 5617 | ||
5624 | unregister_blkdev(MAJOR_NR,"md"); | 5618 | unregister_blkdev(MAJOR_NR,"md"); |
5625 | unregister_blkdev(mdp_major, "mdp"); | 5619 | unregister_blkdev(mdp_major, "mdp"); |