Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65dd297a authored by Scott Wood's avatar Scott Wood Committed by Dave Chinner
Browse files

xfs: %pF is only for function pointers 



Use %pS for actual addresses, otherwise you'll get bad output
on arches like ppc64 where %pF expects a function descriptor.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 29916df0

fs/xfs/xfs_error.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ xfs_error_report( 
{

	if (level <= xfs_error_level) {

		xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT,

		"Internal error %s at line %d of file %s.  Caller %pF",

		"Internal error %s at line %d of file %s.  Caller %pS",

			    tag, linenum, filename, ra);



		xfs_stack_trace();

fs/xfs/xfs_trace.h

+10 −10
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ DECLARE_EVENT_CLASS(xfs_perag_class, 
		__entry->refcount = refcount;

		__entry->caller_ip = caller_ip;

	),

	TP_printk("dev %d:%d agno %u refcount %d caller %pf",

	TP_printk("dev %d:%d agno %u refcount %d caller %ps",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  __entry->agno,

		  __entry->refcount,
@@ -239,7 +239,7 @@ TRACE_EVENT(xfs_iext_insert, 
		__entry->caller_ip = caller_ip;

	),

	TP_printk("dev %d:%d ino 0x%llx state %s idx %ld "

		  "offset %lld block %lld count %lld flag %d caller %pf",

		  "offset %lld block %lld count %lld flag %d caller %ps",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  __entry->ino,

		  __print_flags(__entry->bmap_state, "|", XFS_BMAP_EXT_FLAGS),
@@ -283,7 +283,7 @@ DECLARE_EVENT_CLASS(xfs_bmap_class, 
		__entry->caller_ip = caller_ip;

	),

	TP_printk("dev %d:%d ino 0x%llx state %s idx %ld "

		  "offset %lld block %lld count %lld flag %d caller %pf",

		  "offset %lld block %lld count %lld flag %d caller %ps",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  __entry->ino,

		  __print_flags(__entry->bmap_state, "|", XFS_BMAP_EXT_FLAGS),
@@ -329,7 +329,7 @@ DECLARE_EVENT_CLASS(xfs_buf_class, 
		__entry->caller_ip = caller_ip;

	),

	TP_printk("dev %d:%d bno 0x%llx nblks 0x%x hold %d pincount %d "

		  "lock %d flags %s caller %pf",

		  "lock %d flags %s caller %ps",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  (unsigned long long)__entry->bno,

		  __entry->nblks,
@@ -402,7 +402,7 @@ DECLARE_EVENT_CLASS(xfs_buf_flags_class, 
		__entry->caller_ip = caller_ip;

	),

	TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d "

		  "lock %d flags %s caller %pf",

		  "lock %d flags %s caller %ps",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  (unsigned long long)__entry->bno,

		  __entry->buffer_length,
@@ -447,7 +447,7 @@ TRACE_EVENT(xfs_buf_ioerror, 
		__entry->caller_ip = caller_ip;

	),

	TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d "

		  "lock %d error %d flags %s caller %pf",

		  "lock %d error %d flags %s caller %ps",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  (unsigned long long)__entry->bno,

		  __entry->buffer_length,
@@ -613,7 +613,7 @@ DECLARE_EVENT_CLASS(xfs_lock_class, 
		__entry->lock_flags = lock_flags;

		__entry->caller_ip = caller_ip;

	),

	TP_printk("dev %d:%d ino 0x%llx flags %s caller %pf",

	TP_printk("dev %d:%d ino 0x%llx flags %s caller %ps",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  __entry->ino,

		  __print_flags(__entry->lock_flags, "|", XFS_LOCK_FLAGS),
@@ -702,7 +702,7 @@ DECLARE_EVENT_CLASS(xfs_iref_class, 
		__entry->pincount = atomic_read(&ip->i_pincount);

		__entry->caller_ip = caller_ip;

	),

	TP_printk("dev %d:%d ino 0x%llx count %d pincount %d caller %pf",

	TP_printk("dev %d:%d ino 0x%llx count %d pincount %d caller %ps",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  __entry->ino,

		  __entry->count,
@@ -1333,7 +1333,7 @@ TRACE_EVENT(xfs_bunmap, 
		__entry->flags = flags;

	),

	TP_printk("dev %d:%d ino 0x%llx size 0x%llx bno 0x%llx len 0x%llx"

		  "flags %s caller %pf",

		  "flags %s caller %ps",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  __entry->ino,

		  __entry->size,
@@ -1466,7 +1466,7 @@ TRACE_EVENT(xfs_agf, 
	),

	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 "

		  "freeblks %u longest %u caller %pf",

		  "freeblks %u longest %u caller %ps",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  __entry->agno,

		  __print_flags(__entry->flags, "|", XFS_AGF_FLAGS),