From 389150344a57ac7878e990f992f115bcf196beeb Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Thu, 28 Aug 2008 06:25:49 +0400
Subject: [PATCH] --- yaml --- r: 117473 b: refs/heads/master c:
 6de24f0ed08054b2a202902e4d63beff27654db8 h: refs/heads/master i:   117471:
 ce28746fb713839e55c8904d32e2b5946d01b2aa v: v3

---
 [refs]                   | 2 +-
 trunk/fs/super.c         | 7 +------
 trunk/include/linux/fs.h | 1 -
 trunk/init/main.c        | 1 -
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 852a28f47767..449f49e11309 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8966c5e0fc867f5a7da5756b4cd1b8bbbed3d5dd
+refs/heads/master: 6de24f0ed08054b2a202902e4d63beff27654db8
diff --git a/trunk/fs/super.c b/trunk/fs/super.c
index e931ae9511fe..dd23bf927fbc 100644
--- a/trunk/fs/super.c
+++ b/trunk/fs/super.c
@@ -682,7 +682,7 @@ void emergency_remount(void)
  * filesystems which don't use real block-devices.  -- jrs
  */
 
-static struct idr unnamed_dev_idr;
+static DEFINE_IDR(unnamed_dev_idr);
 static DEFINE_SPINLOCK(unnamed_dev_lock);/* protects the above */
 
 int set_anon_super(struct super_block *s, void *data)
@@ -726,11 +726,6 @@ void kill_anon_super(struct super_block *sb)
 
 EXPORT_SYMBOL(kill_anon_super);
 
-void __init unnamed_dev_init(void)
-{
-	idr_init(&unnamed_dev_idr);
-}
-
 void kill_litter_super(struct super_block *sb)
 {
 	if (sb->s_root)
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index a6a625be13fc..5f70aa62cf0f 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -1593,7 +1593,6 @@ extern int get_sb_pseudo(struct file_system_type *, char *,
 	struct vfsmount *mnt);
 extern int simple_set_mnt(struct vfsmount *mnt, struct super_block *sb);
 int __put_super_and_need_restart(struct super_block *sb);
-void unnamed_dev_init(void);
 
 /* Alas, no aliases. Too much hassle with bringing module.h everywhere */
 #define fops_get(fops) \
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 3e17a3bafe60..c6a1024a27a3 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -670,7 +670,6 @@ asmlinkage void __init start_kernel(void)
 	fork_init(num_physpages);
 	proc_caches_init();
 	buffer_init();
-	unnamed_dev_init();
 	key_init();
 	security_init();
 	vfs_caches_init(num_physpages);