[tip:tracing/blktrace] blktrace: fix possible memory leak

From: Li Zefan
Date: Sat Mar 21 2009 - 11:19:38 EST


Commit-ID: 1a17662ea033674a58bad3603531b0b5d42572f6
Gitweb: http://git.kernel.org/tip/1a17662ea033674a58bad3603531b0b5d42572f6
Author: Li Zefan <lizf@xxxxxxxxxxxxxx>
AuthorDate: Fri, 20 Mar 2009 09:47:30 +0800
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sat, 21 Mar 2009 16:15:47 +0100

blktrace: fix possible memory leak

When we failed to create "block" debugfs dir, we should do some
cleanups.

Signed-off-by: Li Zefan <lizf@xxxxxxxxxxxxxx>
Acked-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Acked-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Jens Axboe <jens.axboe@xxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
LKML-Reference: <49C2F5B2.8000800@xxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>


---
kernel/trace/blktrace.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index b171778..fb3bc53 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -432,7 +432,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
if (!blk_tree_root) {
blk_tree_root = debugfs_create_dir("block", NULL);
if (!blk_tree_root)
- return -ENOMEM;
+ goto err;
}

dir = debugfs_create_dir(buts->name, blk_tree_root);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/