lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

proc: simplify locking in remove_proc_entry()

Browse Source 
proc_subdir_lock protects only modifying and walking through PDE lists, so
after we've found PDE to remove and actually removed it from lists, there is
no need to hold proc_subdir_lock for the rest of operation.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alexey Dobriyan
2008-04-29 01:01:39 -07:00
committed by Linus Torvalds
parent 638fa202cd
commit f649d6d326
1 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fs/proc/generic.c
View File

@@ -734,21 +734,26 @@ void free_proc_entry(struct proc_dir_entry *de)
void remove_proc_entry(const char *name, struct proc_dir_entry *parent) void remove_proc_entry(const char *name, struct proc_dir_entry *parent)
{ {
struct proc_dir_entry **p; struct proc_dir_entry **p;
struct proc_dir_entry *de; struct proc_dir_entry *de = NULL;
const char *fn = name; const char *fn = name;
int len; int len;
if (!parent && xlate_proc_name(name, &parent, &fn) != 0) if (!parent && xlate_proc_name(name, &parent, &fn) != 0)
goto out; return;
len = strlen(fn); len = strlen(fn);
spin_lock(&proc_subdir_lock); spin_lock(&proc_subdir_lock);
for (p = &parent->subdir; *p; p=&(*p)->next ) { for (p = &parent->subdir; *p; p=&(*p)->next ) {
if (!proc_match(len, fn, *p)) if (proc_match(len, fn, *p)) {
continue;
de = *p; de = *p;
*p = de->next; *p = de->next;
de->next = NULL; de->next = NULL;
break;
}
}
spin_unlock(&proc_subdir_lock);
if (!de)
return;
spin_lock(&de->pde_unload_lock); spin_lock(&de->pde_unload_lock);
/* /*
@@ -764,11 +769,9 @@ void remove_proc_entry(const char *name, struct proc_dir_entry *parent)
de->pde_unload_completion = &c; de->pde_unload_completion = &c;
spin_unlock(&de->pde_unload_lock); spin_unlock(&de->pde_unload_lock);
spin_unlock(&proc_subdir_lock);
wait_for_completion(de->pde_unload_completion); wait_for_completion(de->pde_unload_completion);
spin_lock(&proc_subdir_lock);
goto continue_removing; goto continue_removing;
} }
spin_unlock(&de->pde_unload_lock); spin_unlock(&de->pde_unload_lock);
@@ -785,9 +788,4 @@ continue_removing:
} }
if (atomic_dec_and_test(&de->count)) if (atomic_dec_and_test(&de->count))
free_proc_entry(de); free_proc_entry(de);
break;
}
spin_unlock(&proc_subdir_lock);
out:
return;
} }