Merge "trace: f2fs: Fix kasan slab-out-of-bounds" (50909ff9) · Commits · e / devices / android_kernel_fairphone_FP4

include/trace/events/f2fs.h

+9 −9

Original line number	Diff line number	Diff line
		@@ -334,7 +334,7 @@ TRACE_EVENT(f2fs_unlink_enter,
		__field(ino_t, ino)
		__field(loff_t, size)
		__field(blkcnt_t, blocks)
		__field(const char *, name)
		__string(name, dentry->d_name.name)
		),

		TP_fast_assign(
		@@ -342,7 +342,7 @@ TRACE_EVENT(f2fs_unlink_enter,
		__entry->ino = dir->i_ino;
		__entry->size = dir->i_size;
		__entry->blocks = dir->i_blocks;
		__entry->name = dentry->d_name.name;
		__assign_str(name, dentry->d_name.name);
		),

		TP_printk("dev = (%d,%d), dir ino = %lu, i_size = %lld, "
		@@ -350,7 +350,7 @@ TRACE_EVENT(f2fs_unlink_enter,
		show_dev_ino(__entry),
		__entry->size,
		(unsigned long long)__entry->blocks,
		__entry->name)
		__get_str(name))
		);

		DEFINE_EVENT(f2fs__inode_exit, f2fs_unlink_exit,
		@@ -811,20 +811,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)
		);

		@@ -838,7 +838,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)
		),
		@@ -846,14 +846,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)
		);