Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf8517cf authored by Jiri Olsa's avatar Jiri Olsa Committed by Ingo Molnar
Browse files

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: default avatarJiri Olsa <jolsa@redhat.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20091023233646.399670810@goodmis.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 964fe080

kernel/trace/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

kernel/trace/trace.c

+4 −4
Original line number Diff line number Diff line
@@ -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)