diff options
Diffstat (limited to 'fs/namespace.c')
-rw-r--r-- | fs/namespace.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 36d180858136..66d921e14fee 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
14 | #include <linux/smp_lock.h> | 14 | #include <linux/smp_lock.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/kernel.h> | ||
16 | #include <linux/quotaops.h> | 17 | #include <linux/quotaops.h> |
17 | #include <linux/acct.h> | 18 | #include <linux/acct.h> |
18 | #include <linux/capability.h> | 19 | #include <linux/capability.h> |
@@ -23,12 +24,11 @@ | |||
23 | #include <linux/namei.h> | 24 | #include <linux/namei.h> |
24 | #include <linux/security.h> | 25 | #include <linux/security.h> |
25 | #include <linux/mount.h> | 26 | #include <linux/mount.h> |
27 | #include <linux/ramfs.h> | ||
26 | #include <asm/uaccess.h> | 28 | #include <asm/uaccess.h> |
27 | #include <asm/unistd.h> | 29 | #include <asm/unistd.h> |
28 | #include "pnode.h" | 30 | #include "pnode.h" |
29 | 31 | ||
30 | extern int __init init_rootfs(void); | ||
31 | |||
32 | /* spinlock for vfsmount related operations, inplace of dcache_lock */ | 32 | /* spinlock for vfsmount related operations, inplace of dcache_lock */ |
33 | __cacheline_aligned_in_smp DEFINE_SPINLOCK(vfsmount_lock); | 33 | __cacheline_aligned_in_smp DEFINE_SPINLOCK(vfsmount_lock); |
34 | 34 | ||
@@ -1813,6 +1813,7 @@ void __init mnt_init(unsigned long mempages) | |||
1813 | struct list_head *d; | 1813 | struct list_head *d; |
1814 | unsigned int nr_hash; | 1814 | unsigned int nr_hash; |
1815 | int i; | 1815 | int i; |
1816 | int err; | ||
1816 | 1817 | ||
1817 | init_rwsem(&namespace_sem); | 1818 | init_rwsem(&namespace_sem); |
1818 | 1819 | ||
@@ -1853,8 +1854,14 @@ void __init mnt_init(unsigned long mempages) | |||
1853 | d++; | 1854 | d++; |
1854 | i--; | 1855 | i--; |
1855 | } while (i); | 1856 | } while (i); |
1856 | sysfs_init(); | 1857 | err = sysfs_init(); |
1857 | subsystem_register(&fs_subsys); | 1858 | if (err) |
1859 | printk(KERN_WARNING "%s: sysfs_init error: %d\n", | ||
1860 | __FUNCTION__, err); | ||
1861 | err = subsystem_register(&fs_subsys); | ||
1862 | if (err) | ||
1863 | printk(KERN_WARNING "%s: subsystem_register error: %d\n", | ||
1864 | __FUNCTION__, err); | ||
1858 | init_rootfs(); | 1865 | init_rootfs(); |
1859 | init_mount_tree(); | 1866 | init_mount_tree(); |
1860 | } | 1867 | } |