lkml.org 
[lkml]   [2009]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/4] tracing: updating *ppos instead of filp->f_pos
    Date
    Instead of direct updating filp->f_pos we should update *ppos argument.
    The filp->f_pos gets updated within the file_pos_write function called
    from sys_write.

    wbr,
    jirka

    Signed-off-by: Jiri Olsa <jolsa@redhat.com>
    ---
    kernel/trace/ftrace.c | 2 +-
    kernel/trace/trace.c | 8 ++++----
    2 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
    index b10c0d9..1ed514f 100644
    --- a/kernel/trace/ftrace.c
    +++ b/kernel/trace/ftrace.c
    @@ -751,7 +751,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 026e715..9d3067a 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)
    --
    1.6.2.5


    \
     
     \ /
      Last update: 2009-10-21 16:41    [W:0.031 / U:0.064 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site