Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[safe/jmp/linux-2.6] / fs / sysfs / mount.c

diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
index 89db07e..7761378 100644 (file)
--- a/fs/sysfs/mount.c
+++ b/fs/sysfs/mount.c
@@ -18,12 +18,12 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/magic.h>
+#include <linux/slab.h>
 
 #include "sysfs.h"
 
 
 static struct vfsmount *sysfs_mount;
-struct super_block * sysfs_sb = NULL;
 struct kmem_cache *sysfs_dir_cachep;
 
 static const struct super_operations sysfs_ops = {
@@ -50,7 +50,6 @@ static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
        sb->s_magic = SYSFS_MAGIC;
        sb->s_op = &sysfs_ops;
        sb->s_time_gran = 1;
-       sysfs_sb = sb;
 
        /* get root inode, initialize and unlock it */
        mutex_lock(&sysfs_mutex);