diff options
Diffstat (limited to 'fs/ramfs/inode.c')
-rw-r--r-- | fs/ramfs/inode.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c index fb99863598be..39d14659a8d3 100644 --- a/fs/ramfs/inode.c +++ b/fs/ramfs/inode.c | |||
@@ -244,17 +244,6 @@ struct dentry *ramfs_mount(struct file_system_type *fs_type, | |||
244 | return mount_nodev(fs_type, flags, data, ramfs_fill_super); | 244 | return mount_nodev(fs_type, flags, data, ramfs_fill_super); |
245 | } | 245 | } |
246 | 246 | ||
247 | static struct dentry *rootfs_mount(struct file_system_type *fs_type, | ||
248 | int flags, const char *dev_name, void *data) | ||
249 | { | ||
250 | static unsigned long once; | ||
251 | |||
252 | if (test_and_set_bit(0, &once)) | ||
253 | return ERR_PTR(-ENODEV); | ||
254 | |||
255 | return mount_nodev(fs_type, flags, data, ramfs_fill_super); | ||
256 | } | ||
257 | |||
258 | static void ramfs_kill_sb(struct super_block *sb) | 247 | static void ramfs_kill_sb(struct super_block *sb) |
259 | { | 248 | { |
260 | kfree(sb->s_fs_info); | 249 | kfree(sb->s_fs_info); |
@@ -267,13 +256,8 @@ static struct file_system_type ramfs_fs_type = { | |||
267 | .kill_sb = ramfs_kill_sb, | 256 | .kill_sb = ramfs_kill_sb, |
268 | .fs_flags = FS_USERNS_MOUNT, | 257 | .fs_flags = FS_USERNS_MOUNT, |
269 | }; | 258 | }; |
270 | static struct file_system_type rootfs_fs_type = { | ||
271 | .name = "rootfs", | ||
272 | .mount = rootfs_mount, | ||
273 | .kill_sb = kill_litter_super, | ||
274 | }; | ||
275 | 259 | ||
276 | static int __init init_ramfs_fs(void) | 260 | int __init init_ramfs_fs(void) |
277 | { | 261 | { |
278 | static unsigned long once; | 262 | static unsigned long once; |
279 | int err; | 263 | int err; |
@@ -292,17 +276,3 @@ static int __init init_ramfs_fs(void) | |||
292 | return err; | 276 | return err; |
293 | } | 277 | } |
294 | module_init(init_ramfs_fs) | 278 | module_init(init_ramfs_fs) |
295 | |||
296 | int __init init_rootfs(void) | ||
297 | { | ||
298 | int err = register_filesystem(&rootfs_fs_type); | ||
299 | |||
300 | if (err) | ||
301 | return err; | ||
302 | |||
303 | err = init_ramfs_fs(); | ||
304 | if (err) | ||
305 | unregister_filesystem(&rootfs_fs_type); | ||
306 | |||
307 | return err; | ||
308 | } | ||