[XFS] move v_trace from bhv_vnode to xfs_inode

struct bhv_vnode is on it's way out, so move the trace buffer to the XFS
inode. Note that this makes the tracing macros rather misnamed, but this
kind of fallout will be fixed up incrementally later on.

SGI-PV: 969608
SGI-Modid: xfs-linux-melb:xfs-kern:29498a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 21 insertions, 21 deletions

diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index e7ef78fb4da3..98653793b34a 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -88,7 +88,7 @@ xfs_getattr(
         bhv_vnode_t     *vp = XFS_ITOV(ip);
         xfs_mount_t     *mp = ip->i_mount;
 
-        vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(ip, __FUNCTION__, (inst_t *)__return_address);
 
         if (XFS_FORCED_SHUTDOWN(mp))
                 return XFS_ERROR(EIO);
@@ -228,7 +228,7 @@ xfs_setattr(
         int                     file_owner;
         int                     need_iolock = 1;
 
-        vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(ip, __FUNCTION__, (inst_t *)__return_address);
 
         if (XFS_MTOVFS(mp)->vfs_flag & VFS_RDONLY)
                 return XFS_ERROR(EROFS);
@@ -915,7 +915,7 @@ xfs_access(
 {
         int             error;
 
-        vn_trace_entry(XFS_ITOV(ip), __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(ip, __FUNCTION__, (inst_t *)__return_address);
 
         xfs_ilock(ip, XFS_ILOCK_SHARED);
         error = xfs_iaccess(ip, mode, credp);
@@ -987,7 +987,7 @@ xfs_readlink(
         int             pathlen;
         int             error = 0;
 
-        vn_trace_entry(XFS_ITOV(ip), __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(ip, __FUNCTION__, (inst_t *)__return_address);
 
         if (XFS_FORCED_SHUTDOWN(mp))
                 return XFS_ERROR(EIO);
@@ -1033,7 +1033,7 @@ xfs_fsync(
         int             error;
         int             log_flushed = 0, changed = 1;
 
-        vn_trace_entry(XFS_ITOV(ip), __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(ip, __FUNCTION__, (inst_t *)__return_address);
 
         ASSERT(start >= 0 && stop >= -1);
 
@@ -1592,7 +1592,7 @@ xfs_inactive(
         int             error;
         int             truncate;
 
-        vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(ip, __FUNCTION__, (inst_t *)__return_address);
 
         /*
          * If the inode is already free, then there can be nothing
@@ -1805,7 +1805,7 @@ xfs_lookup(
         int                     error;
         uint                    lock_mode;
 
-        vn_trace_entry(XFS_ITOV(dp), __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(dp, __FUNCTION__, (inst_t *)__return_address);
 
         if (XFS_FORCED_SHUTDOWN(dp->i_mount))
                 return XFS_ERROR(EIO);
@@ -1849,7 +1849,7 @@ xfs_create(
         int                     namelen;
 
         ASSERT(!*vpp);
-        vn_trace_entry(dir_vp, __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(dp, __FUNCTION__, (inst_t *)__return_address);
 
         dm_di_mode = vap->va_mode;
         namelen = VNAMELEN(dentry);
@@ -2326,7 +2326,7 @@ xfs_remove(
         uint                    resblks;
         int                     namelen;
 
-        vn_trace_entry(dir_vp, __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(dp, __FUNCTION__, (inst_t *)__return_address);
 
         if (XFS_FORCED_SHUTDOWN(mp))
                 return XFS_ERROR(EIO);
@@ -2369,7 +2369,7 @@ xfs_remove(
 
         dm_di_mode = ip->i_d.di_mode;
 
-        vn_trace_entry(XFS_ITOV(ip), __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(ip, __FUNCTION__, (inst_t *)__return_address);
 
         ITRACE(ip);
 
@@ -2503,7 +2503,7 @@ xfs_remove(
         if (link_zero && xfs_inode_is_filestream(ip))
                 xfs_filestream_deassociate(ip);
 
-        vn_trace_exit(XFS_ITOV(ip), __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_exit(ip, __FUNCTION__, (inst_t *)__return_address);
 
         IRELE(ip);
 
@@ -2567,8 +2567,8 @@ xfs_link(
         char                    *target_name = VNAME(dentry);
         int                     target_namelen;
 
-        vn_trace_entry(target_dir_vp, __FUNCTION__, (inst_t *)__return_address);
-        vn_trace_entry(src_vp, __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(tdp, __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(xfs_vtoi(src_vp), __FUNCTION__, (inst_t *)__return_address);
 
         target_namelen = VNAMELEN(dentry);
         ASSERT(!VN_ISDIR(src_vp));
@@ -2751,7 +2751,7 @@ xfs_mkdir(
 
         /* Return through std_return after this point. */
 
-        vn_trace_entry(dir_vp, __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(dp, __FUNCTION__, (inst_t *)__return_address);
 
         mp = dp->i_mount;
         udqp = gdqp = NULL;
@@ -2945,7 +2945,7 @@ xfs_rmdir(
         int                     last_cdp_link;
         uint                    resblks;
 
-        vn_trace_entry(dir_vp, __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(dp, __FUNCTION__, (inst_t *)__return_address);
 
         if (XFS_FORCED_SHUTDOWN(mp))
                 return XFS_ERROR(EIO);
@@ -3198,7 +3198,7 @@ xfs_symlink(
         ip = NULL;
         tp = NULL;
 
-        vn_trace_entry(dir_vp, __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(dp, __FUNCTION__, (inst_t *)__return_address);
 
 
         if (XFS_FORCED_SHUTDOWN(mp))
@@ -3490,7 +3490,7 @@ xfs_fid2(
 {
         xfs_fid2_t      *xfid = (xfs_fid2_t *)fidp;
 
-        vn_trace_entry(XFS_ITOV(ip), __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(ip, __FUNCTION__, (inst_t *)__return_address);
         ASSERT(sizeof(fid_t) >= sizeof(xfs_fid2_t));
 
         xfid->fid_len = sizeof(xfs_fid2_t) - sizeof(xfid->fid_len);
@@ -3673,7 +3673,7 @@ xfs_reclaim(
 {
         bhv_vnode_t     *vp = XFS_ITOV(ip);
 
-        vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(ip, __FUNCTION__, (inst_t *)__return_address);
 
         ASSERT(!VN_MAPPED(vp));
 
@@ -3891,7 +3891,7 @@ xfs_alloc_file_space(
         int                     committed;
         int                     error;
 
-        vn_trace_entry(XFS_ITOV(ip), __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(ip, __FUNCTION__, (inst_t *)__return_address);
 
         if (XFS_FORCED_SHUTDOWN(mp))
                 return XFS_ERROR(EIO);
@@ -4161,7 +4161,7 @@ xfs_free_file_space(
         vp = XFS_ITOV(ip);
         mp = ip->i_mount;
 
-        vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(ip, __FUNCTION__, (inst_t *)__return_address);
 
         if ((error = XFS_QM_DQATTACH(mp, ip, 0)))
                 return error;
@@ -4367,7 +4367,7 @@ xfs_change_file_space(
         xfs_trans_t     *tp;
         bhv_vattr_t     va;
 
-        vn_trace_entry(XFS_ITOV(ip), __FUNCTION__, (inst_t *)__return_address);
+        vn_trace_entry(ip, __FUNCTION__, (inst_t *)__return_address);
 
         /*
          * must be a regular file and have write permission