Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 aff68a55 编写于 作者: D Darrick J. Wong
浏览文件
操作

xfs: use %pS printk format for direct instruction addresses 

Use the %pS instead of the %pF printk format specifier for printing
symbols from direct addresses. This is needed for the ia64, ppc64 and
parisc64 architectures.

While we're at it, be consistent with the capitalization of the 'S'.
Signed-off-by: NDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: NDave Chinner <dchinner@redhat.com>
上级 3d170aa2
显示空白变更内容
内联 并排
Showing with 23 addition and 23 deletion
fs/xfs/scrub/trace.h
浏览文件 @ aff68a55
...@@ -90,7 +90,7 @@ TRACE_EVENT(xfs_scrub_op_error, ...@@ -90,7 +90,7 @@ TRACE_EVENT(xfs_scrub_op_error,
__entry->error = error; __entry->error = error;
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d type %u agno %u agbno %u error %d ret_ip %pF", TP_printk("dev %d:%d type %u agno %u agbno %u error %d ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->type, __entry->type,
__entry->agno, __entry->agno,
...@@ -121,7 +121,7 @@ TRACE_EVENT(xfs_scrub_file_op_error, ...@@ -121,7 +121,7 @@ TRACE_EVENT(xfs_scrub_file_op_error,
__entry->error = error; __entry->error = error;
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d ino %llu fork %d type %u offset %llu error %d ret_ip %pF", TP_printk("dev %d:%d ino %llu fork %d type %u offset %llu error %d ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
__entry->whichfork, __entry->whichfork,
...@@ -156,7 +156,7 @@ DECLARE_EVENT_CLASS(xfs_scrub_block_error_class, ...@@ -156,7 +156,7 @@ DECLARE_EVENT_CLASS(xfs_scrub_block_error_class,
__entry->bno = bno; __entry->bno = bno;
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d type %u agno %u agbno %u ret_ip %pF", TP_printk("dev %d:%d type %u agno %u agbno %u ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->type, __entry->type,
__entry->agno, __entry->agno,
...@@ -207,7 +207,7 @@ DECLARE_EVENT_CLASS(xfs_scrub_ino_error_class, ...@@ -207,7 +207,7 @@ DECLARE_EVENT_CLASS(xfs_scrub_ino_error_class,
__entry->bno = bno; __entry->bno = bno;
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d ino %llu type %u agno %u agbno %u ret_ip %pF", TP_printk("dev %d:%d ino %llu type %u agno %u agbno %u ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
__entry->type, __entry->type,
...@@ -246,7 +246,7 @@ DECLARE_EVENT_CLASS(xfs_scrub_fblock_error_class, ...@@ -246,7 +246,7 @@ DECLARE_EVENT_CLASS(xfs_scrub_fblock_error_class,
__entry->offset = offset; __entry->offset = offset;
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d ino %llu fork %d type %u offset %llu ret_ip %pF", TP_printk("dev %d:%d ino %llu fork %d type %u offset %llu ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
__entry->whichfork, __entry->whichfork,
...@@ -277,7 +277,7 @@ TRACE_EVENT(xfs_scrub_incomplete, ...@@ -277,7 +277,7 @@ TRACE_EVENT(xfs_scrub_incomplete,
__entry->type = sc->sm->sm_type; __entry->type = sc->sm->sm_type;
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d type %u ret_ip %pF", TP_printk("dev %d:%d type %u ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->type, __entry->type,
__entry->ret_ip) __entry->ret_ip)
...@@ -311,7 +311,7 @@ TRACE_EVENT(xfs_scrub_btree_op_error, ...@@ -311,7 +311,7 @@ TRACE_EVENT(xfs_scrub_btree_op_error,
__entry->error = error; __entry->error = error;
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d type %u btnum %d level %d ptr %d agno %u agbno %u error %d ret_ip %pF", TP_printk("dev %d:%d type %u btnum %d level %d ptr %d agno %u agbno %u error %d ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->type, __entry->type,
__entry->btnum, __entry->btnum,
...@@ -354,7 +354,7 @@ TRACE_EVENT(xfs_scrub_ifork_btree_op_error, ...@@ -354,7 +354,7 @@ TRACE_EVENT(xfs_scrub_ifork_btree_op_error,
__entry->error = error; __entry->error = error;
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d ino %llu fork %d type %u btnum %d level %d ptr %d agno %u agbno %u error %d ret_ip %pF", TP_printk("dev %d:%d ino %llu fork %d type %u btnum %d level %d ptr %d agno %u agbno %u error %d ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
__entry->whichfork, __entry->whichfork,
...@@ -393,7 +393,7 @@ TRACE_EVENT(xfs_scrub_btree_error, ...@@ -393,7 +393,7 @@ TRACE_EVENT(xfs_scrub_btree_error,
__entry->ptr = cur->bc_ptrs[level]; __entry->ptr = cur->bc_ptrs[level];
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d type %u btnum %d level %d ptr %d agno %u agbno %u ret_ip %pF", TP_printk("dev %d:%d type %u btnum %d level %d ptr %d agno %u agbno %u ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->type, __entry->type,
__entry->btnum, __entry->btnum,
...@@ -433,7 +433,7 @@ TRACE_EVENT(xfs_scrub_ifork_btree_error, ...@@ -433,7 +433,7 @@ TRACE_EVENT(xfs_scrub_ifork_btree_error,
__entry->ptr = cur->bc_ptrs[level]; __entry->ptr = cur->bc_ptrs[level];
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d ino %llu fork %d type %u btnum %d level %d ptr %d agno %u agbno %u ret_ip %pF", TP_printk("dev %d:%d ino %llu fork %d type %u btnum %d level %d ptr %d agno %u agbno %u ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
__entry->whichfork, __entry->whichfork,
......
fs/xfs/xfs_inode.c
浏览文件 @ aff68a55
...@@ -3492,7 +3492,7 @@ xfs_inode_verify_forks( ...@@ -3492,7 +3492,7 @@ xfs_inode_verify_forks(
fa = xfs_ifork_verify_data(ip, &xfs_default_ifork_ops); fa = xfs_ifork_verify_data(ip, &xfs_default_ifork_ops);
if (fa) { if (fa) {
xfs_alert(ip->i_mount, xfs_alert(ip->i_mount,
"%s: bad inode %llu inline data fork at %pF", "%s: bad inode %llu inline data fork at %pS",
__func__, ip->i_ino, fa); __func__, ip->i_ino, fa);
return false; return false;
} }
...@@ -3500,7 +3500,7 @@ xfs_inode_verify_forks( ...@@ -3500,7 +3500,7 @@ xfs_inode_verify_forks(
fa = xfs_ifork_verify_attr(ip, &xfs_default_ifork_ops); fa = xfs_ifork_verify_attr(ip, &xfs_default_ifork_ops);
if (fa) { if (fa) {
xfs_alert(ip->i_mount, xfs_alert(ip->i_mount,
"%s: bad inode %llu inline attr fork at %pF", "%s: bad inode %llu inline attr fork at %pS",
__func__, ip->i_ino, fa); __func__, ip->i_ino, fa);
return false; return false;
} }
......
fs/xfs/xfs_trace.h
浏览文件 @ aff68a55
...@@ -119,7 +119,7 @@ DECLARE_EVENT_CLASS(xfs_perag_class, ...@@ -119,7 +119,7 @@ DECLARE_EVENT_CLASS(xfs_perag_class,
__entry->refcount = refcount; __entry->refcount = refcount;
__entry->caller_ip = caller_ip; __entry->caller_ip = caller_ip;
), ),
TP_printk("dev %d:%d agno %u refcount %d caller %ps", TP_printk("dev %d:%d agno %u refcount %d caller %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->refcount, __entry->refcount,
...@@ -252,7 +252,7 @@ DECLARE_EVENT_CLASS(xfs_bmap_class, ...@@ -252,7 +252,7 @@ DECLARE_EVENT_CLASS(xfs_bmap_class,
__entry->caller_ip = caller_ip; __entry->caller_ip = caller_ip;
), ),
TP_printk("dev %d:%d ino 0x%llx state %s cur %p/%d " TP_printk("dev %d:%d ino 0x%llx state %s cur %p/%d "
"offset %lld block %lld count %lld flag %d caller %ps", "offset %lld block %lld count %lld flag %d caller %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
__print_flags(__entry->bmap_state, "|", XFS_BMAP_EXT_FLAGS), __print_flags(__entry->bmap_state, "|", XFS_BMAP_EXT_FLAGS),
...@@ -301,7 +301,7 @@ DECLARE_EVENT_CLASS(xfs_buf_class, ...@@ -301,7 +301,7 @@ DECLARE_EVENT_CLASS(xfs_buf_class,
__entry->caller_ip = caller_ip; __entry->caller_ip = caller_ip;
), ),
TP_printk("dev %d:%d bno 0x%llx nblks 0x%x hold %d pincount %d " TP_printk("dev %d:%d bno 0x%llx nblks 0x%x hold %d pincount %d "
"lock %d flags %s caller %ps", "lock %d flags %s caller %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->bno, (unsigned long long)__entry->bno,
__entry->nblks, __entry->nblks,
...@@ -370,7 +370,7 @@ DECLARE_EVENT_CLASS(xfs_buf_flags_class, ...@@ -370,7 +370,7 @@ DECLARE_EVENT_CLASS(xfs_buf_flags_class,
__entry->caller_ip = caller_ip; __entry->caller_ip = caller_ip;
), ),
TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d " TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d "
"lock %d flags %s caller %ps", "lock %d flags %s caller %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->bno, (unsigned long long)__entry->bno,
__entry->buffer_length, __entry->buffer_length,
...@@ -579,7 +579,7 @@ DECLARE_EVENT_CLASS(xfs_lock_class, ...@@ -579,7 +579,7 @@ DECLARE_EVENT_CLASS(xfs_lock_class,
__entry->lock_flags = lock_flags; __entry->lock_flags = lock_flags;
__entry->caller_ip = caller_ip; __entry->caller_ip = caller_ip;
), ),
TP_printk("dev %d:%d ino 0x%llx flags %s caller %ps", TP_printk("dev %d:%d ino 0x%llx flags %s caller %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
__print_flags(__entry->lock_flags, "|", XFS_LOCK_FLAGS), __print_flags(__entry->lock_flags, "|", XFS_LOCK_FLAGS),
...@@ -697,7 +697,7 @@ DECLARE_EVENT_CLASS(xfs_iref_class, ...@@ -697,7 +697,7 @@ DECLARE_EVENT_CLASS(xfs_iref_class,
__entry->pincount = atomic_read(&ip->i_pincount); __entry->pincount = atomic_read(&ip->i_pincount);
__entry->caller_ip = caller_ip; __entry->caller_ip = caller_ip;
), ),
TP_printk("dev %d:%d ino 0x%llx count %d pincount %d caller %ps", TP_printk("dev %d:%d ino 0x%llx count %d pincount %d caller %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
__entry->count, __entry->count,
...@@ -1049,7 +1049,7 @@ TRACE_EVENT(xfs_log_force, ...@@ -1049,7 +1049,7 @@ TRACE_EVENT(xfs_log_force,
__entry->lsn = lsn; __entry->lsn = lsn;
__entry->caller_ip = caller_ip; __entry->caller_ip = caller_ip;
), ),
TP_printk("dev %d:%d lsn 0x%llx caller %ps", TP_printk("dev %d:%d lsn 0x%llx caller %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->lsn, (void *)__entry->caller_ip) __entry->lsn, (void *)__entry->caller_ip)
) )
...@@ -1403,7 +1403,7 @@ TRACE_EVENT(xfs_bunmap, ...@@ -1403,7 +1403,7 @@ TRACE_EVENT(xfs_bunmap,
__entry->flags = flags; __entry->flags = flags;
), ),
TP_printk("dev %d:%d ino 0x%llx size 0x%llx bno 0x%llx len 0x%llx" TP_printk("dev %d:%d ino 0x%llx size 0x%llx bno 0x%llx len 0x%llx"
"flags %s caller %ps", "flags %s caller %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
__entry->size, __entry->size,
...@@ -1517,7 +1517,7 @@ TRACE_EVENT(xfs_agf, ...@@ -1517,7 +1517,7 @@ TRACE_EVENT(xfs_agf,
), ),
TP_printk("dev %d:%d agno %u flags %s length %u roots b %u c %u " TP_printk("dev %d:%d agno %u flags %s length %u roots b %u c %u "
"levels b %u c %u flfirst %u fllast %u flcount %u " "levels b %u c %u flfirst %u fllast %u flcount %u "
"freeblks %u longest %u caller %ps", "freeblks %u longest %u caller %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__print_flags(__entry->flags, "|", XFS_AGF_FLAGS), __print_flags(__entry->flags, "|", XFS_AGF_FLAGS),
...@@ -2486,7 +2486,7 @@ DECLARE_EVENT_CLASS(xfs_ag_error_class, ...@@ -2486,7 +2486,7 @@ DECLARE_EVENT_CLASS(xfs_ag_error_class,
__entry->error = error; __entry->error = error;
__entry->caller_ip = caller_ip; __entry->caller_ip = caller_ip;
), ),
TP_printk("dev %d:%d agno %u error %d caller %ps", TP_printk("dev %d:%d agno %u error %d caller %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->error, __entry->error,
...@@ -2977,7 +2977,7 @@ DECLARE_EVENT_CLASS(xfs_inode_error_class, ...@@ -2977,7 +2977,7 @@ DECLARE_EVENT_CLASS(xfs_inode_error_class,
__entry->error = error; __entry->error = error;
__entry->caller_ip = caller_ip; __entry->caller_ip = caller_ip;
), ),
TP_printk("dev %d:%d ino %llx error %d caller %ps", TP_printk("dev %d:%d ino %llx error %d caller %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
__entry->error, __entry->error,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或