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

Commit dbd6a7cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs 

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: kill some warnings on i386 builds
parents d86527dd a539bd8c

fs/xfs/linux-2.6/xfs_trace.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -815,7 +815,7 @@ TRACE_EVENT(name, \ 
	), \

	), \

	TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx " \

	TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx " \

		  "offset 0x%llx count %zd flags %s " \

		  "offset 0x%llx count %zd flags %s " \

		  "startoff 0x%llx startblock 0x%llx blockcount 0x%llx", \

		  "startoff 0x%llx startblock %s blockcount 0x%llx", \

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

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

		  __entry->ino, \

		  __entry->ino, \

		  __entry->size, \

		  __entry->size, \
@@ -824,7 +824,7 @@ TRACE_EVENT(name, \ 
		  __entry->count, \

		  __entry->count, \

		  __print_flags(__entry->flags, "|", BMAPI_FLAGS), \

		  __print_flags(__entry->flags, "|", BMAPI_FLAGS), \

		  __entry->startoff, \

		  __entry->startoff, \

		  __entry->startblock, \

		  xfs_fmtfsblock(__entry->startblock), \

		  __entry->blockcount) \

		  __entry->blockcount) \

)

)

DEFINE_IOMAP_EVENT(xfs_iomap_enter);

DEFINE_IOMAP_EVENT(xfs_iomap_enter);
@@ -1201,7 +1201,7 @@ TRACE_EVENT(name, \ 
	TP_printk("dev %d:%d agno %u agbno %u minlen %u maxlen %u mod %u " \

	TP_printk("dev %d:%d agno %u agbno %u minlen %u maxlen %u mod %u " \

		  "prod %u minleft %u total %u alignment %u minalignslop %u " \

		  "prod %u minleft %u total %u alignment %u minalignslop %u " \

		  "len %u type %s otype %s wasdel %d wasfromfl %d isfl %d " \

		  "len %u type %s otype %s wasdel %d wasfromfl %d isfl %d " \

		  "userdata %d firstblock 0x%llx", \

		  "userdata %d firstblock %s", \

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

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

		  __entry->agno, \

		  __entry->agno, \

		  __entry->agbno, \

		  __entry->agbno, \
@@ -1220,7 +1220,7 @@ TRACE_EVENT(name, \ 
		  __entry->wasfromfl, \

		  __entry->wasfromfl, \

		  __entry->isfl, \

		  __entry->isfl, \

		  __entry->userdata, \

		  __entry->userdata, \

		  __entry->firstblock) \

		  xfs_fmtfsblock(__entry->firstblock)) \

)

)





DEFINE_ALLOC_EVENT(xfs_alloc_exact_done);

DEFINE_ALLOC_EVENT(xfs_alloc_exact_done);