diff options
Diffstat (limited to 'arch/um/drivers/ubd_kern.c')
-rw-r--r-- | arch/um/drivers/ubd_kern.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 290cec6d69e2..0345e2551247 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "linux/blkdev.h" | 25 | #include "linux/blkdev.h" |
26 | #include "linux/hdreg.h" | 26 | #include "linux/hdreg.h" |
27 | #include "linux/init.h" | 27 | #include "linux/init.h" |
28 | #include "linux/devfs_fs_kernel.h" | ||
29 | #include "linux/cdrom.h" | 28 | #include "linux/cdrom.h" |
30 | #include "linux/proc_fs.h" | 29 | #include "linux/proc_fs.h" |
31 | #include "linux/ctype.h" | 30 | #include "linux/ctype.h" |
@@ -628,7 +627,6 @@ static int ubd_new_disk(int major, u64 size, int unit, | |||
628 | 627 | ||
629 | { | 628 | { |
630 | struct gendisk *disk; | 629 | struct gendisk *disk; |
631 | char from[sizeof("ubd/nnnnn\0")], to[sizeof("discnnnnn/disc\0")]; | ||
632 | int err; | 630 | int err; |
633 | 631 | ||
634 | disk = alloc_disk(1 << UBD_SHIFT); | 632 | disk = alloc_disk(1 << UBD_SHIFT); |
@@ -639,20 +637,10 @@ static int ubd_new_disk(int major, u64 size, int unit, | |||
639 | disk->first_minor = unit << UBD_SHIFT; | 637 | disk->first_minor = unit << UBD_SHIFT; |
640 | disk->fops = &ubd_blops; | 638 | disk->fops = &ubd_blops; |
641 | set_capacity(disk, size / 512); | 639 | set_capacity(disk, size / 512); |
642 | if(major == MAJOR_NR){ | 640 | if(major == MAJOR_NR) |
643 | sprintf(disk->disk_name, "ubd%c", 'a' + unit); | 641 | sprintf(disk->disk_name, "ubd%c", 'a' + unit); |
644 | sprintf(disk->devfs_name, "ubd/disc%d", unit); | 642 | else |
645 | sprintf(from, "ubd/%d", unit); | ||
646 | sprintf(to, "disc%d/disc", unit); | ||
647 | err = devfs_mk_symlink(from, to); | ||
648 | if(err) | ||
649 | printk("ubd_new_disk failed to make link from %s to " | ||
650 | "%s, error = %d\n", from, to, err); | ||
651 | } | ||
652 | else { | ||
653 | sprintf(disk->disk_name, "ubd_fake%d", unit); | 643 | sprintf(disk->disk_name, "ubd_fake%d", unit); |
654 | sprintf(disk->devfs_name, "ubd_fake/disc%d", unit); | ||
655 | } | ||
656 | 644 | ||
657 | /* sysfs register (not for ide fake devices) */ | 645 | /* sysfs register (not for ide fake devices) */ |
658 | if (major == MAJOR_NR) { | 646 | if (major == MAJOR_NR) { |
@@ -841,7 +829,6 @@ int ubd_init(void) | |||
841 | { | 829 | { |
842 | int i; | 830 | int i; |
843 | 831 | ||
844 | devfs_mk_dir("ubd"); | ||
845 | if (register_blkdev(MAJOR_NR, "ubd")) | 832 | if (register_blkdev(MAJOR_NR, "ubd")) |
846 | return -1; | 833 | return -1; |
847 | 834 | ||
@@ -855,7 +842,6 @@ int ubd_init(void) | |||
855 | char name[sizeof("ubd_nnn\0")]; | 842 | char name[sizeof("ubd_nnn\0")]; |
856 | 843 | ||
857 | snprintf(name, sizeof(name), "ubd_%d", fake_major); | 844 | snprintf(name, sizeof(name), "ubd_%d", fake_major); |
858 | devfs_mk_dir(name); | ||
859 | if (register_blkdev(fake_major, "ubd")) | 845 | if (register_blkdev(fake_major, "ubd")) |
860 | return -1; | 846 | return -1; |
861 | } | 847 | } |