diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 12:01:06 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 12:01:06 -0800 |
commit | a0c9f240a992c4c2b6ac40324ece27475cf3b71a (patch) | |
tree | e42e5231d0e551b1b1f726c06c2ca27c510efb7a /fs/proc/inode.c | |
parent | 5bb47b9ff3d16d40f8d45380b373497a545fa280 (diff) | |
parent | 230e40fbda242544389a5428a2efac568178ddfe (diff) |
Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc
* 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc:
proc: remove write-only variable in proc_pident_lookup()
proc: fix sparse warning
proc: add /proc/*/stack
proc: remove '##' usage
proc: remove useless WARN_ONs
proc: stop using BKL
Diffstat (limited to 'fs/proc/inode.c')
-rw-r--r-- | fs/proc/inode.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 2543fd00c65..3e76bb9b3ad 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -35,16 +35,13 @@ struct proc_dir_entry *de_get(struct proc_dir_entry *de) */ void de_put(struct proc_dir_entry *de) { - lock_kernel(); if (!atomic_read(&de->count)) { printk("de_put: entry %s already free!\n", de->name); - unlock_kernel(); return; } if (atomic_dec_and_test(&de->count)) free_proc_entry(de); - unlock_kernel(); } /* |