diff options
Diffstat (limited to 'drivers/block/nbd.c')
| -rw-r--r-- | drivers/block/nbd.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 7f554f2ed079..39662f0c9cce 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c | |||
| @@ -29,8 +29,6 @@ | |||
| 29 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 30 | #include <net/sock.h> | 30 | #include <net/sock.h> |
| 31 | 31 | ||
| 32 | #include <linux/devfs_fs_kernel.h> | ||
| 33 | |||
| 34 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
| 35 | #include <asm/system.h> | 33 | #include <asm/system.h> |
| 36 | #include <asm/types.h> | 34 | #include <asm/types.h> |
| @@ -642,7 +640,6 @@ static int __init nbd_init(void) | |||
| 642 | printk(KERN_INFO "nbd: registered device at major %d\n", NBD_MAJOR); | 640 | printk(KERN_INFO "nbd: registered device at major %d\n", NBD_MAJOR); |
| 643 | dprintk(DBG_INIT, "nbd: debugflags=0x%x\n", debugflags); | 641 | dprintk(DBG_INIT, "nbd: debugflags=0x%x\n", debugflags); |
| 644 | 642 | ||
| 645 | devfs_mk_dir("nbd"); | ||
| 646 | for (i = 0; i < nbds_max; i++) { | 643 | for (i = 0; i < nbds_max; i++) { |
| 647 | struct gendisk *disk = nbd_dev[i].disk; | 644 | struct gendisk *disk = nbd_dev[i].disk; |
| 648 | nbd_dev[i].file = NULL; | 645 | nbd_dev[i].file = NULL; |
| @@ -660,7 +657,6 @@ static int __init nbd_init(void) | |||
| 660 | disk->private_data = &nbd_dev[i]; | 657 | disk->private_data = &nbd_dev[i]; |
| 661 | disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO; | 658 | disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO; |
| 662 | sprintf(disk->disk_name, "nbd%d", i); | 659 | sprintf(disk->disk_name, "nbd%d", i); |
| 663 | sprintf(disk->devfs_name, "nbd/%d", i); | ||
| 664 | set_capacity(disk, 0x7ffffc00ULL << 1); /* 2 TB */ | 660 | set_capacity(disk, 0x7ffffc00ULL << 1); /* 2 TB */ |
| 665 | add_disk(disk); | 661 | add_disk(disk); |
| 666 | } | 662 | } |
| @@ -686,7 +682,6 @@ static void __exit nbd_cleanup(void) | |||
| 686 | put_disk(disk); | 682 | put_disk(disk); |
| 687 | } | 683 | } |
| 688 | } | 684 | } |
| 689 | devfs_remove("nbd"); | ||
| 690 | unregister_blkdev(NBD_MAJOR, "nbd"); | 685 | unregister_blkdev(NBD_MAJOR, "nbd"); |
| 691 | printk(KERN_INFO "nbd: unregistered device at major %d\n", NBD_MAJOR); | 686 | printk(KERN_INFO "nbd: unregistered device at major %d\n", NBD_MAJOR); |
| 692 | } | 687 | } |
