diff options
-rw-r--r-- | kernel/trace/ftrace.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index e14ff4c1713e..232b898eebbd 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
@@ -3010,7 +3010,13 @@ ftrace_regex_open(struct ftrace_ops *ops, int flag, | |||
3010 | hash = ops->filter_hash; | 3010 | hash = ops->filter_hash; |
3011 | 3011 | ||
3012 | if (file->f_mode & FMODE_WRITE) { | 3012 | if (file->f_mode & FMODE_WRITE) { |
3013 | iter->hash = alloc_and_copy_ftrace_hash(FTRACE_HASH_DEFAULT_BITS, hash); | 3013 | const int size_bits = FTRACE_HASH_DEFAULT_BITS; |
3014 | |||
3015 | if (file->f_flags & O_TRUNC) | ||
3016 | iter->hash = alloc_ftrace_hash(size_bits); | ||
3017 | else | ||
3018 | iter->hash = alloc_and_copy_ftrace_hash(size_bits, hash); | ||
3019 | |||
3014 | if (!iter->hash) { | 3020 | if (!iter->hash) { |
3015 | trace_parser_put(&iter->parser); | 3021 | trace_parser_put(&iter->parser); |
3016 | kfree(iter); | 3022 | kfree(iter); |
@@ -3019,10 +3025,6 @@ ftrace_regex_open(struct ftrace_ops *ops, int flag, | |||
3019 | } | 3025 | } |
3020 | } | 3026 | } |
3021 | 3027 | ||
3022 | if ((file->f_mode & FMODE_WRITE) && | ||
3023 | (file->f_flags & O_TRUNC)) | ||
3024 | ftrace_filter_reset(iter->hash); | ||
3025 | |||
3026 | if (file->f_mode & FMODE_READ) { | 3028 | if (file->f_mode & FMODE_READ) { |
3027 | iter->pg = ftrace_pages_start; | 3029 | iter->pg = ftrace_pages_start; |
3028 | 3030 | ||