Commit 025b245f authored by Carlos Maiolino's avatar Carlos Maiolino
Browse files

Merge branch 'xfs-7.0-fixes' into for-next 



Signed-off-by: default avatarCarlos Maiolino <cem@kernel.org>
parents df236c99 e31c53a8

fs/xfs/scrub/trace.h

+2 −10
Original line number Diff line number Diff line
@@ -972,20 +972,12 @@ TRACE_EVENT(xfile_create, 
	TP_STRUCT__entry(

		__field(dev_t, dev)

		__field(unsigned long, ino)

		__array(char, pathname, MAXNAMELEN)

	),

	TP_fast_assign(

		char		*path;



		__entry->ino = file_inode(xf->file)->i_ino;

		path = file_path(xf->file, __entry->pathname, MAXNAMELEN);

		if (IS_ERR(path))

			strncpy(__entry->pathname, "(unknown)",

					sizeof(__entry->pathname));

	),

	TP_printk("xfino 0x%lx path '%s'",

		  __entry->ino,

		  __entry->pathname)

	TP_printk("xfino 0x%lx",

		  __entry->ino)

);



TRACE_EVENT(xfile_destroy,

fs/xfs/xfs_attr_item.c

+0 −1
Original line number Diff line number Diff line
@@ -653,7 +653,6 @@ xfs_attri_recover_work( 
		break;

	}

	if (error) {

		xfs_irele(ip);

		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, attrp,

				sizeof(*attrp));

		return ERR_PTR(-EFSCORRUPTED);

fs/xfs/xfs_trace.h

+2 −9
Original line number Diff line number Diff line
@@ -5119,23 +5119,16 @@ TRACE_EVENT(xmbuf_create, 
	TP_STRUCT__entry(

		__field(dev_t, dev)

		__field(unsigned long, ino)

		__array(char, pathname, MAXNAMELEN)

	),

	TP_fast_assign(

		char		*path;

		struct file	*file = btp->bt_file;



		__entry->dev = btp->bt_mount->m_super->s_dev;

		__entry->ino = file_inode(file)->i_ino;

		path = file_path(file, __entry->pathname, MAXNAMELEN);

		if (IS_ERR(path))

			strncpy(__entry->pathname, "(unknown)",

					sizeof(__entry->pathname));

	),

	TP_printk("dev %d:%d xmino 0x%lx path '%s'",

	TP_printk("dev %d:%d xmino 0x%lx",

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

		  __entry->ino,

		  __entry->pathname)

		  __entry->ino)

);



TRACE_EVENT(xmbuf_free,