From b96f44c99a308c172c503c13cd39d53a0b3c4eba Mon Sep 17 00:00:00 2001 From: Li Zefan Date: Thu, 23 Jul 2009 11:29:11 +0800 Subject: [PATCH] --- yaml --- r: 156139 b: refs/heads/master c: 87827111a5538633b18e5c641ced673c4c2bb6ce h: refs/heads/master i: 156137: c04d1e1e83f63e837900249673dbc06c35eae1d0 156135: 45534613e20a15bd5153df04617ed6c1754525c5 v: v3 --- [refs] | 2 +- trunk/kernel/trace/ftrace.c | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f0bedad2f02e..d0e695dba2c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8cc1ab793993c886c62abf77c93287df33ffd8b +refs/heads/master: 87827111a5538633b18e5c641ced673c4c2bb6ce diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c index 4521c77d1a1a..1f3ec2afa511 100644 --- a/trunk/kernel/trace/ftrace.c +++ b/trunk/kernel/trace/ftrace.c @@ -2595,6 +2595,14 @@ ftrace_graph_open(struct inode *inode, struct file *file) return ret; } +static int +ftrace_graph_release(struct inode *inode, struct file *file) +{ + if (file->f_mode & FMODE_READ) + seq_release(inode, file); + return 0; +} + static int ftrace_set_func(unsigned long *array, int *idx, char *buffer) { @@ -2724,9 +2732,10 @@ ftrace_graph_write(struct file *file, const char __user *ubuf, } static const struct file_operations ftrace_graph_fops = { - .open = ftrace_graph_open, - .read = seq_read, - .write = ftrace_graph_write, + .open = ftrace_graph_open, + .read = seq_read, + .write = ftrace_graph_write, + .release = ftrace_graph_release, }; #endif /* CONFIG_FUNCTION_GRAPH_TRACER */