Commit fd51d251 authored May 19, 2009 by Stefan Raspl Committed by Ingo Molnar May 19, 2009

blktrace: remove debugfs entries on bad path



debugfs directory entries for devices are not removed on some
of the failure pathes in do_blk_trace_setup().
One way to reproduce is to start blktrace on multiple devices
with insufficient Vmalloc space: Devices will fail with
a message like this:

	BLKTRACESETUP(2) /dev/sdu failed: 5/Input/output error

If so, the respective entries in debugfs
(e.g. /sys/kernel/debug/block/sdu) will remain and subsequent
attempts to start blktrace on the respective devices will not
succeed due to existing directories.

[ Impact: fix /debug/tracing file cleanup corner case ]

Signed-off-by: Stefan Raspl <stefan.raspl@linux.vnet.ibm.com>
Acked-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: schwidefsky@de.ibm.com
Cc: heiko.carstens@de.ibm.com
LKML-Reference: <4A1266CC.5040801@linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 143c145e

kernel/trace/blktrace.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -262,6 +262,7 @@ static void blk_trace_free(struct blk_trace *bt)
		{
		debugfs_remove(bt->msg_file);
		debugfs_remove(bt->dropped_file);
		debugfs_remove(bt->dir);
		relay_close(bt->rchan);
		free_percpu(bt->sequence);
		free_percpu(bt->msg_data);

Admin message