commit 6de24f0ed08054b2a202902e4d63beff27654db8
author Alexey Dobriyan <adobriyan@gmail.com> Thu Aug 28 06:25:49 2008 +0400
committer Al Viro <viro@zeniv.linux.org.uk> Thu Oct 23 05:13:13 2008 -0400
tree 91f378a0335b5b9756020d37e1c54bba4a2d6434
parent 8966c5e0fc867f5a7da5756b4cd1b8bbbed3d5dd

[PATCH 1/2] anondev: init IDR statically

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

fs/super.c

diff --git a/fs/super.c b/fs/super.c
index e931ae9..dd23bf9 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -682,7 +682,7 @@
  * 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 @@
 
 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)

include/linux/fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index a6a625b..5f70aa6 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1593,7 +1593,6 @@
 	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) \

init/main.c

diff --git a/init/main.c b/init/main.c
index 3e17a3b..c6a1024 100644
--- a/init/main.c
+++ b/init/main.c
@@ -670,7 +670,6 @@
 	fork_init(num_physpages);
 	proc_caches_init();
 	buffer_init();
-	unnamed_dev_init();
 	key_init();
 	security_init();
 	vfs_caches_init(num_physpages);