Merge tag 'writeback_for_v5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs (5b4049d8) · Commits · 戴 / test

include/trace/events/writeback.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -190,7 +190,7 @@ TRACE_EVENT(inode_foreign_history,
		),

		TP_fast_assign(
		strncpy(__entry->name, bdi_dev_name(inode_to_bdi(inode)), 32);
		strscpy_pad(__entry->name, bdi_dev_name(inode_to_bdi(inode)), 32);
		__entry->ino = inode->i_ino;
		__entry->cgroup_ino = __trace_wbc_assign_cgroup(wbc);
		__entry->history = history;
		@@ -219,7 +219,7 @@ TRACE_EVENT(inode_switch_wbs,
		),

		TP_fast_assign(
		strncpy(__entry->name, bdi_dev_name(old_wb->bdi), 32);
		strscpy_pad(__entry->name, bdi_dev_name(old_wb->bdi), 32);
		__entry->ino = inode->i_ino;
		__entry->old_cgroup_ino = __trace_wb_assign_cgroup(old_wb);
		__entry->new_cgroup_ino = __trace_wb_assign_cgroup(new_wb);
		@@ -252,7 +252,7 @@ TRACE_EVENT(track_foreign_dirty,
		struct address_space *mapping = page_mapping(page);
		struct inode *inode = mapping ? mapping->host : NULL;

		strncpy(__entry->name, bdi_dev_name(wb->bdi), 32);
		strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32);
		__entry->bdi_id = wb->bdi->id;
		__entry->ino = inode ? inode->i_ino : 0;
		__entry->memcg_id = wb->memcg_css->id;
		@@ -285,7 +285,7 @@ TRACE_EVENT(flush_foreign,
		),

		TP_fast_assign(
		strncpy(__entry->name, bdi_dev_name(wb->bdi), 32);
		strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32);
		__entry->cgroup_ino = __trace_wb_assign_cgroup(wb);
		__entry->frn_bdi_id = frn_bdi_id;
		__entry->frn_memcg_id = frn_memcg_id;