diff --git a/[refs] b/[refs] index 9bae183dc921..4e0fd592496f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e6e1db4ac7acfe3e38bbef9eba59233ba7f6b9a +refs/heads/master: f87fd4c2a0c4f3baad28057360b36a59591ef751 diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c index 8bc15b362d23..ce97becff461 100644 --- a/trunk/fs/namespace.c +++ b/trunk/fs/namespace.c @@ -48,6 +48,10 @@ static int hash_mask __read_mostly, hash_bits __read_mostly; static kmem_cache_t *mnt_cache; static struct rw_semaphore namespace_sem; +/* /sys/fs */ +decl_subsys(fs, NULL, NULL); +EXPORT_SYMBOL_GPL(fs_subsys); + static inline unsigned long hash(struct vfsmount *mnt, struct dentry *dentry) { unsigned long tmp = ((unsigned long)mnt / L1_CACHE_BYTES); @@ -1725,6 +1729,7 @@ void __init mnt_init(unsigned long mempages) i--; } while (i); sysfs_init(); + subsystem_register(&fs_subsys); init_rootfs(); init_mount_tree(); } diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 552cedfa6064..b77f2608eef9 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -1290,6 +1290,9 @@ extern void mnt_set_mountpoint(struct vfsmount *, struct dentry *, extern int vfs_statfs(struct super_block *, struct kstatfs *); +/* /sys/fs */ +extern struct subsystem fs_subsys; + #define FLOCK_VERIFY_READ 1 #define FLOCK_VERIFY_WRITE 2