[XFS] clean up vnode/inode tracing

Simplify vnode tracing calls by embedding function name & return addr in
the calling macro.

Also do a lot of vnode->inode renaming for consistency, while we're at it.

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

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

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/xfs/xfs_rename.c b/fs/xfs/xfs_rename.c
index 44ea0ba36476..17e7496bdd5f 100644
--- a/fs/xfs/xfs_rename.c
+++ b/fs/xfs/xfs_rename.c
@@ -118,7 +118,7 @@ xfs_lock_for_rename(
         inum1 = ip1->i_ino;
 
         ASSERT(ip1);
-        ITRACE(ip1);
+        xfs_itrace_ref(ip1);
 
         /*
          * Unlock dp1 and lock dp2 if they are different.
@@ -141,7 +141,7 @@ xfs_lock_for_rename(
                 IRELE (ip1);
                 return error;
         } else {
-                ITRACE(ip2);
+                xfs_itrace_ref(ip2);
         }
 
         /*
@@ -247,8 +247,8 @@ xfs_rename(
         int             src_namelen = VNAMELEN(src_vname);
         int             target_namelen = VNAMELEN(target_vname);
 
-        vn_trace_entry(src_dp, "xfs_rename", (inst_t *)__return_address);
-        vn_trace_entry(xfs_vtoi(target_dir_vp), "xfs_rename", (inst_t *)__return_address);
+        xfs_itrace_entry(src_dp);
+        xfs_itrace_entry(xfs_vtoi(target_dir_vp));
 
         /*
          * Find the XFS behavior descriptor for the target directory