diff options
author | Alexey Dobriyan <adobriyan@sw.ru> | 2008-04-29 04:01:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:17 -0400 |
commit | e93b4ea20adb20f1f1f07f10ba5d7dd739d2843e (patch) | |
tree | 69afed8fb7a13a0dd9e1f1e1dbfc663620d78363 /fs | |
parent | 7249db2c281ac688977ecc6862cdee9969d310e2 (diff) |
proc: print more information when removing non-empty directories
This usually saves one recompile to insert similar printk like below. :)
Sample nastygram:
remove_proc_entry: removing non-empty directory '/proc/foo', leaking at least 'bar'
------------[ cut here ]------------
WARNING: at fs/proc/generic.c:776 remove_proc_entry+0x18a/0x200()
Modules linked in: foo(-) container fan battery dock sbs ac sbshc backlight ipv6 loop af_packet amd_rng sr_mod i2c_amd8111 i2c_amd756 cdrom i2c_core button thermal processor
Pid: 3034, comm: rmmod Tainted: G M 2.6.25-rc1 #5
Call Trace:
[<ffffffff80231974>] warn_on_slowpath+0x64/0x90
[<ffffffff80232a6e>] printk+0x4e/0x60
[<ffffffff802d6c8a>] remove_proc_entry+0x18a/0x200
[<ffffffff8045cd88>] mutex_lock_nested+0x1c8/0x2d0
[<ffffffff8025f0f0>] __try_stop_module+0x0/0x40
[<ffffffff8025effd>] sys_delete_module+0x14d/0x200
[<ffffffff8045df3d>] lockdep_sys_exit_thunk+0x35/0x67
[<ffffffff8031c307>] __up_read+0x27/0xa0
[<ffffffff8045decc>] trace_hardirqs_on_thunk+0x35/0x3a
[<ffffffff8020b6ab>] system_call_after_swapgs+0x7b/0x80
---[ end trace 10ef850597e89c54 ]---
Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/proc/generic.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c index a36ad3c75cf4..f501f3211abc 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c | |||
@@ -777,7 +777,12 @@ continue_removing: | |||
777 | if (S_ISDIR(de->mode)) | 777 | if (S_ISDIR(de->mode)) |
778 | parent->nlink--; | 778 | parent->nlink--; |
779 | de->nlink = 0; | 779 | de->nlink = 0; |
780 | WARN_ON(de->subdir); | 780 | if (de->subdir) { |
781 | printk(KERN_WARNING "%s: removing non-empty directory " | ||
782 | "'%s/%s', leaking at least '%s'\n", __func__, | ||
783 | de->parent->name, de->name, de->subdir->name); | ||
784 | WARN_ON(1); | ||
785 | } | ||
781 | if (atomic_dec_and_test(&de->count)) | 786 | if (atomic_dec_and_test(&de->count)) |
782 | free_proc_entry(de); | 787 | free_proc_entry(de); |
783 | break; | 788 | break; |