diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2011-01-12 20:00:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 11:03:17 -0500 |
commit | 3740a20c4fe8697cb604a7d51395d23472b1768f (patch) | |
tree | dac4b07e654742bc60fad44c55327d8b3f86e4b3 /fs/proc | |
parent | a6fc86d2b43bf1086557f023a24adf91db915559 (diff) |
proc: less LOCK/UNLOCK in remove_proc_entry()
For the common case where a proc entry is being removed and nobody is in
the process of using it, save a LOCK/UNLOCK pair.
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>
Diffstat (limited to 'fs/proc')
-rw-r--r-- | fs/proc/generic.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c index d00c5af6f199..01e07f2a188f 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c | |||
@@ -826,12 +826,9 @@ void remove_proc_entry(const char *name, struct proc_dir_entry *parent) | |||
826 | 826 | ||
827 | wait_for_completion(de->pde_unload_completion); | 827 | wait_for_completion(de->pde_unload_completion); |
828 | 828 | ||
829 | goto continue_removing; | 829 | spin_lock(&de->pde_unload_lock); |
830 | } | 830 | } |
831 | spin_unlock(&de->pde_unload_lock); | ||
832 | 831 | ||
833 | continue_removing: | ||
834 | spin_lock(&de->pde_unload_lock); | ||
835 | while (!list_empty(&de->pde_openers)) { | 832 | while (!list_empty(&de->pde_openers)) { |
836 | struct pde_opener *pdeo; | 833 | struct pde_opener *pdeo; |
837 | 834 | ||