The following commit has been merged in the linux branch: commit cf8517cf905b5cd31d5790250b9ac39f7cb8aa53 Author: Jiri Olsa jolsa@redhat.com Date: Fri Oct 23 19:36:16 2009 -0400
tracing: Update *ppos instead of filp->f_pos
Instead of directly updating filp->f_pos we should update the *ppos argument. The filp->f_pos gets updated within the file_pos_write() function called from sys_write().
Signed-off-by: Jiri Olsa jolsa@redhat.com Signed-off-by: Steven Rostedt rostedt@goodmis.org Cc: Frederic Weisbecker fweisbec@gmail.com LKML-Reference: 20091023233646.399670810@goodmis.org Signed-off-by: Ingo Molnar mingo@elte.hu
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 37ba67e..9c451a1 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -740,7 +740,7 @@ ftrace_profile_write(struct file *filp, const char __user *ubuf, out: mutex_unlock(&ftrace_profile_lock);
- filp->f_pos += cnt; + *ppos += cnt;
return cnt; } diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c820b03..b20d3ec 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2440,7 +2440,7 @@ tracing_trace_options_write(struct file *filp, const char __user *ubuf, return ret; }
- filp->f_pos += cnt; + *ppos += cnt;
return cnt; } @@ -2582,7 +2582,7 @@ tracing_ctrl_write(struct file *filp, const char __user *ubuf, } mutex_unlock(&trace_types_lock);
- filp->f_pos += cnt; + *ppos += cnt;
return cnt; } @@ -2764,7 +2764,7 @@ tracing_set_trace_write(struct file *filp, const char __user *ubuf, if (err) return err;
- filp->f_pos += ret; + *ppos += ret;
return ret; } @@ -3299,7 +3299,7 @@ tracing_entries_write(struct file *filp, const char __user *ubuf, } }
- filp->f_pos += cnt; + *ppos += cnt;
/* If check pages failed, return ENOMEM */ if (tracing_disabled)