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

Commit 15947f2d authored by Lachlan McIlroy's avatar Lachlan McIlroy Committed by Lachlan McIlroy
Browse files

[XFS] more vnode/inode tracing fixes 



SGI-PV: 970335
SGI-Modid: xfs-linux-melb:xfs-kern:29697a

Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 7642861b

fs/xfs/linux-2.6/xfs_vnode.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -314,12 +314,15 @@ extern void xfs_itrace_rele(struct xfs_inode *, char *, int, inst_t *); 
	_xfs_itrace_entry(ip, __FUNCTION__, (inst_t *)__return_address)

	_xfs_itrace_entry(ip, __FUNCTION__, (inst_t *)__return_address)

#define xfs_itrace_exit(ip)	\

#define xfs_itrace_exit(ip)	\

	_xfs_itrace_exit(ip, __FUNCTION__, (inst_t *)__return_address)

	_xfs_itrace_exit(ip, __FUNCTION__, (inst_t *)__return_address)

#define xfs_itrace_exit_tag(ip, tag)	\

	_xfs_itrace_exit(ip, tag, (inst_t *)__return_address)

#define xfs_itrace_ref(ip)	\

#define xfs_itrace_ref(ip)	\

	_xfs_itrace_ref(ip, __FILE__, __LINE__, (inst_t *)__return_address)

	_xfs_itrace_ref(ip, __FILE__, __LINE__, (inst_t *)__return_address)





#else

#else

#define	xfs_itrace_entry(a)

#define	xfs_itrace_entry(a)

#define	xfs_itrace_exit(a)

#define	xfs_itrace_exit(a)

#define	xfs_itrace_exit_tag(a, b)

#define	xfs_itrace_hold(a, b, c, d)

#define	xfs_itrace_hold(a, b, c, d)

#define	xfs_itrace_ref(a)

#define	xfs_itrace_ref(a)

#define	xfs_itrace_rele(a, b, c, d)

#define	xfs_itrace_rele(a, b, c, d)

fs/xfs/xfs_iget.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -157,8 +157,7 @@ xfs_iget_core( 
				goto again;

				goto again;

			}

			}





			_xfs_itrace_exit(ip, "xfs_iget.alloc",

			xfs_itrace_exit_tag(ip, "xfs_iget.alloc");

				(inst_t *)__return_address);





			XFS_STATS_INC(xs_ig_found);

			XFS_STATS_INC(xs_ig_found);
@@ -212,8 +211,7 @@ xfs_iget_core( 
			xfs_ilock(ip, lock_flags);

			xfs_ilock(ip, lock_flags);





		xfs_iflags_clear(ip, XFS_ISTALE);

		xfs_iflags_clear(ip, XFS_ISTALE);

		_xfs_itrace_exit(ip, "xfs_iget.found",

		xfs_itrace_exit_tag(ip, "xfs_iget.found");

					(inst_t *)__return_address);

		goto return_ip;

		goto return_ip;

	}

	}
@@ -234,7 +232,7 @@ xfs_iget_core( 
		return error;

		return error;

	}

	}





	_xfs_itrace_exit(ip, "xfs_iget.alloc", (inst_t *)__return_address);

	xfs_itrace_exit_tag(ip, "xfs_iget.alloc");





	xfs_inode_lock_init(ip, vp);

	xfs_inode_lock_init(ip, vp);

	xfs_iocore_inode_init(ip);

	xfs_iocore_inode_init(ip);