From cb7f39b79c818affe6bf955f1e5131ca80a9035b Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Mon, 16 Jan 2006 11:48:01 +0000
Subject: [PATCH] --- yaml --- r: 38571 b: refs/heads/master c:
 fba7b940194465ac7a8f0cdf793959fb5fbb8834 h: refs/heads/master i:   38569:
 d2e99d5a4e9d8df0286bf2e4b4e90e94aaa148d1   38567:
 0737c92b4845060d326e941a0258624c58abb16e v: v3

---
 [refs]                   | 2 +-
 trunk/fs/namespace.c     | 5 +++++
 trunk/include/linux/fs.h | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dfb34a826843..1c21188ed8f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b346671fa196abaf82ed3e1842f981209f7887af
+refs/heads/master: fba7b940194465ac7a8f0cdf793959fb5fbb8834
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..eabc80d22bbc 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -1293,6 +1293,9 @@ extern int vfs_statfs(struct super_block *, struct kstatfs *);
 #define FLOCK_VERIFY_READ  1
 #define FLOCK_VERIFY_WRITE 2
 
+/* /sys/fs */
+extern struct subsystem fs_subsys;
+
 extern int locks_mandatory_locked(struct inode *);
 extern int locks_mandatory_area(int, struct inode *, struct file *, loff_t, size_t);