[PATCH 1/2] anondev: init IDR statically

From: Alexey Dobriyan
Date: Wed Aug 27 2008 - 22:24:26 EST


Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
---

fs/super.c | 7 +------
include/linux/fs.h | 1 -
init/main.c | 1 -
3 files changed, 1 insertion(+), 8 deletions(-)

--- a/fs/super.c
+++ b/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)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1568,7 +1568,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) \
--- a/init/main.c
+++ b/init/main.c
@@ -686,7 +686,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);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/