Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Linux 6.10 compat: Remove second parameter of __assign_str() 

In Linux kernel commit 2c92ca849fcc6ee7d0c358e9959abc9f58661aea,
the second parameter of __assign_str() was removed. 
As the instruction says, there is no need to pass the second parameter.
But I didn't check if it would break anything to simply remove
the second parameter.

Signed-off-by: Pinghigh <pinghigh24678@outlook.com>
This commit is contained in:
Tibrella 2024-07-27 12:52:00 +08:00 committed by GitHub
parent 62e7d3c89e
commit 061b185ff8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/os/linux/zfs/sys/trace_dbgmsg.h
View File

@ -59,7 +59,7 @@ DECLARE_EVENT_CLASS(zfs_dprintf_class,
__string(msg, msg) __string(msg, msg)
), ),
TP_fast_assign( TP_fast_assign(
__assign_str(msg, msg); __assign_str(msg);
), ),
TP_printk("%s", __get_str(msg)) TP_printk("%s", __get_str(msg))
); );

13
include/os/linux/zfs/sys/trace_dbuf.h
View File

@ -60,18 +60,13 @@
#define DBUF_TP_FAST_ASSIGN \ #define DBUF_TP_FAST_ASSIGN \
if (db != NULL) { \ if (db != NULL) { \
if (POINTER_IS_VALID(DB_DNODE(db)->dn_objset)) { \ __assign_str(os_spa); \
__assign_str(os_spa, \ \
spa_name(DB_DNODE(db)->dn_objset->os_spa)); \
} else { \
__assign_str(os_spa, "NULL"); \
} \
\
__entry->ds_object = db->db_objset->os_dsl_dataset ? \ __entry->ds_object = db->db_objset->os_dsl_dataset ? \
db->db_objset->os_dsl_dataset->ds_object : 0; \ db->db_objset->os_dsl_dataset->ds_object : 0; \
\ \
__entry->db_object = db->db.db_object; \ __entry->db_object = db->db.db_object; \
__entry->db_level = db->db_level; \ __entry->db_level = db->db_level;
__entry->db_blkid = db->db_blkid; \ __entry->db_blkid = db->db_blkid; \
__entry->db_offset = db->db.db_offset; \ __entry->db_offset = db->db.db_offset; \
__entry->db_size = db->db.db_size; \ __entry->db_size = db->db.db_size; \
@ -80,7 +75,7 @@
snprintf(__get_str(msg), TRACE_DBUF_MSG_MAX, \ snprintf(__get_str(msg), TRACE_DBUF_MSG_MAX, \
DBUF_TP_PRINTK_FMT, DBUF_TP_PRINTK_ARGS); \ DBUF_TP_PRINTK_FMT, DBUF_TP_PRINTK_ARGS); \
} else { \ } else { \
__assign_str(os_spa, "NULL"); \ __assign_str(os_spa); \
__entry->ds_object = 0; \ __entry->ds_object = 0; \
__entry->db_object = 0; \ __entry->db_object = 0; \
__entry->db_level = 0; \ __entry->db_level = 0; \