--- 25-akpm/fs/proc/generic.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff -puN fs/proc/generic.c~increase-number-of-dynamic-inodes-in-procfs-265-idr-init fs/proc/generic.c --- 25/fs/proc/generic.c~increase-number-of-dynamic-inodes-in-procfs-265-idr-init 2004-04-14 19:47:41.313236640 -0700 +++ 25-akpm/fs/proc/generic.c 2004-04-14 19:48:42.484937128 -0700 @@ -277,16 +277,11 @@ static int xlate_proc_name(const char *n return 0; } -static struct idr proc_inum_idr; +static DEFINE_IDR(proc_inum_idr); static spinlock_t proc_inum_lock = SPIN_LOCK_UNLOCKED; /* protects the above */ #define PROC_DYNAMIC_FIRST 0xF0000000UL -void __init init_proc_inum_idr(void) -{ - idr_init(&proc_inum_idr); -} - /* * Return an inode number between PROC_DYNAMIC_FIRST and * 0xffffffff, or zero on failure. @@ -376,6 +371,7 @@ struct dentry *proc_lookup(struct inode continue; if (!memcmp(dentry->d_name.name, de->name, de->namelen)) { unsigned int ino = de->low_ino; + error = -EINVAL; inode = proc_get_inode(dir->i_sb, ino, de); break; _