lkml.org 
[lkml]   [2021]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 050/154] f2fs: fix up f2fs_lookup tracepoints
    Date
    From: Gao Xiang <hsiangkao@linux.alibaba.com>

    [ Upstream commit 70a9ac36ffd807ac506ed0b849f3e8ce3c6623f2 ]

    Fix up a misuse that the filename pointer isn't always valid in
    the ring buffer, and we should copy the content instead.

    Fixes: 0c5e36db17f5 ("f2fs: trace f2fs_lookup")
    Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
    Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/trace/events/f2fs.h | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
    index 56b113e3cd6aa..df293bc7f03b8 100644
    --- a/include/trace/events/f2fs.h
    +++ b/include/trace/events/f2fs.h
    @@ -807,20 +807,20 @@ TRACE_EVENT(f2fs_lookup_start,
    TP_STRUCT__entry(
    __field(dev_t, dev)
    __field(ino_t, ino)
    - __field(const char *, name)
    + __string(name, dentry->d_name.name)
    __field(unsigned int, flags)
    ),

    TP_fast_assign(
    __entry->dev = dir->i_sb->s_dev;
    __entry->ino = dir->i_ino;
    - __entry->name = dentry->d_name.name;
    + __assign_str(name, dentry->d_name.name);
    __entry->flags = flags;
    ),

    TP_printk("dev = (%d,%d), pino = %lu, name:%s, flags:%u",
    show_dev_ino(__entry),
    - __entry->name,
    + __get_str(name),
    __entry->flags)
    );

    @@ -834,7 +834,7 @@ TRACE_EVENT(f2fs_lookup_end,
    TP_STRUCT__entry(
    __field(dev_t, dev)
    __field(ino_t, ino)
    - __field(const char *, name)
    + __string(name, dentry->d_name.name)
    __field(nid_t, cino)
    __field(int, err)
    ),
    @@ -842,14 +842,14 @@ TRACE_EVENT(f2fs_lookup_end,
    TP_fast_assign(
    __entry->dev = dir->i_sb->s_dev;
    __entry->ino = dir->i_ino;
    - __entry->name = dentry->d_name.name;
    + __assign_str(name, dentry->d_name.name);
    __entry->cino = ino;
    __entry->err = err;
    ),

    TP_printk("dev = (%d,%d), pino = %lu, name:%s, ino:%u, err:%d",
    show_dev_ino(__entry),
    - __entry->name,
    + __get_str(name),
    __entry->cino,
    __entry->err)
    );
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-24 14:32    [W:4.227 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site