[XFS] more vnode/inode tracing fixes

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

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Tim Shimmin <tes@sgi.com>

fs/xfs/linux-2.6/xfs_vnode.h

@@ -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)
 #define xfs_itrace_exit(ip)	\
 	_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)	\
 	_xfs_itrace_ref(ip, __FILE__, __LINE__, (inst_t *)__return_address)
 
 #else
 #define	xfs_itrace_entry(a)
 #define	xfs_itrace_exit(a)
+#define	xfs_itrace_exit_tag(a, b)
 #define	xfs_itrace_hold(a, b, c, d)
 #define	xfs_itrace_ref(a)
 #define	xfs_itrace_rele(a, b, c, d)

fs/xfs/xfs_iget.c

@@ -157,8 +157,7 @@ again:
 				goto again;
 			}
 
-			_xfs_itrace_exit(ip, "xfs_iget.alloc",
-				(inst_t *)__return_address);
+			xfs_itrace_exit_tag(ip, "xfs_iget.alloc");
 
 			XFS_STATS_INC(xs_ig_found);
 
@@ -212,8 +211,7 @@ finish_inode:
 			xfs_ilock(ip, lock_flags);
 
 		xfs_iflags_clear(ip, XFS_ISTALE);
-		_xfs_itrace_exit(ip, "xfs_iget.found",
-					(inst_t *)__return_address);
+		xfs_itrace_exit_tag(ip, "xfs_iget.found");
 		goto return_ip;
 	}
 
@@ -234,7 +232,7 @@ finish_inode:
 		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_iocore_inode_init(ip);