diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-12 16:55:46 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-12 16:55:46 (GMT) |
commit | a3620f7545344f932873bf98fbdf416b49409c8e (patch) | |
tree | febf6c9547e5f860d614cc78a55eefe888ad1419 | |
parent | 78efd1ddd95d2fac1ed8d5fadd9dab885ea70e55 (diff) | |
parent | 39cbb602b543e477df71dca84b5b2e36f8bd29fc (diff) | |
download | linux-fsl-qoriq-a3620f7545344f932873bf98fbdf416b49409c8e.tar.xz |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Remove double removal of blktrace directory
-rw-r--r-- | kernel/trace/blktrace.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 1090b0a..7a34cb5 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -267,8 +267,8 @@ 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); + debugfs_remove(bt->dir); free_percpu(bt->sequence); free_percpu(bt->msg_data); kfree(bt); @@ -378,18 +378,8 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf, static int blk_remove_buf_file_callback(struct dentry *dentry) { - struct dentry *parent = dentry->d_parent; debugfs_remove(dentry); - /* - * this will fail for all but the last file, but that is ok. what we - * care about is the top level buts->name directory going away, when - * the last trace file is gone. Then we don't have to rmdir() that - * manually on trace stop, so it nicely solves the issue with - * force killing of running traces. - */ - - debugfs_remove(parent); return 0; } |