git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
block
/
vroot.c
diff --git
a/drivers/block/vroot.c
b/drivers/block/vroot.c
index
9ef8302
..
554427a
100644
(file)
--- a/
drivers/block/vroot.c
+++ b/
drivers/block/vroot.c
@@
-6,7
+6,7
@@
*
* based on the loop.c code by Theodore Ts'o.
*
*
* based on the loop.c code by Theodore Ts'o.
*
- * Copyright (C) 2002-200
5
by Herbert Pötzl.
+ * Copyright (C) 2002-200
7
by Herbert Pötzl.
* Redistribution of this file is permitted under the
* GNU General Public License.
*
* Redistribution of this file is permitted under the
* GNU General Public License.
*
@@
-17,10
+17,9
@@
#include <linux/file.h>
#include <linux/major.h>
#include <linux/blkdev.h>
#include <linux/file.h>
#include <linux/major.h>
#include <linux/blkdev.h>
-#include <linux/devfs_fs_kernel.h>
#include <linux/vroot.h>
#include <linux/vroot.h>
-#include <linux/vs
erver/debug
.h>
+#include <linux/vs
_context
.h>
static int max_vroot = 8;
static int max_vroot = 8;
@@
-212,8
+211,6
@@
int __init vroot_init(void)
goto out_mem3;
}
goto out_mem3;
}
- devfs_mk_dir("vroot");
-
for (i = 0; i < max_vroot; i++) {
struct vroot_device *vr = &vroot_dev[i];
struct gendisk *disk = disks[i];
for (i = 0; i < max_vroot; i++) {
struct vroot_device *vr = &vroot_dev[i];
struct gendisk *disk = disks[i];
@@
-225,21
+222,18
@@
int __init vroot_init(void)
disk->first_minor = i;
disk->fops = &vr_fops;
sprintf(disk->disk_name, "vroot%d", i);
disk->first_minor = i;
disk->fops = &vr_fops;
sprintf(disk->disk_name, "vroot%d", i);
- sprintf(disk->devfs_name, "vroot/%d", i);
disk->private_data = vr;
}
err = register_vroot_grb(&__vroot_get_real_bdev);
if (err)
disk->private_data = vr;
}
err = register_vroot_grb(&__vroot_get_real_bdev);
if (err)
- goto out_
reg
;
+ goto out_
mem3
;
for (i = 0; i < max_vroot; i++)
add_disk(disks[i]);
printk(KERN_INFO "vroot: loaded (max %d devices)\n", max_vroot);
return 0;
for (i = 0; i < max_vroot; i++)
add_disk(disks[i]);
printk(KERN_INFO "vroot: loaded (max %d devices)\n", max_vroot);
return 0;
-out_reg:
- devfs_remove("vroot");
out_mem3:
while (i--)
put_disk(disks[i]);
out_mem3:
while (i--)
put_disk(disks[i]);
@@
-263,7
+257,6
@@
void vroot_exit(void)
del_gendisk(disks[i]);
put_disk(disks[i]);
}
del_gendisk(disks[i]);
put_disk(disks[i]);
}
- devfs_remove("vroot");
if (unregister_blkdev(VROOT_MAJOR, "vroot"))
printk(KERN_WARNING "vroot: cannot unregister blkdev\n");
if (unregister_blkdev(VROOT_MAJOR, "vroot"))
printk(KERN_WARNING "vroot: cannot unregister blkdev\n");