aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/xfs/linux-2.6/xfs_vnode.h3
-rw-r--r--fs/xfs/xfs_iget.c8
2 files changed, 6 insertions, 5 deletions
diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h
index 09763067da11..bb3983a1bbbd 100644
--- a/fs/xfs/linux-2.6/xfs_vnode.h
+++ b/fs/xfs/linux-2.6/xfs_vnode.h
@@ -314,12 +314,15 @@ extern void xfs_itrace_rele(struct xfs_inode *, char *, int, inst_t *);
314 _xfs_itrace_entry(ip, __FUNCTION__, (inst_t *)__return_address) 314 _xfs_itrace_entry(ip, __FUNCTION__, (inst_t *)__return_address)
315#define xfs_itrace_exit(ip) \ 315#define xfs_itrace_exit(ip) \
316 _xfs_itrace_exit(ip, __FUNCTION__, (inst_t *)__return_address) 316 _xfs_itrace_exit(ip, __FUNCTION__, (inst_t *)__return_address)
317#define xfs_itrace_exit_tag(ip, tag) \
318 _xfs_itrace_exit(ip, tag, (inst_t *)__return_address)
317#define xfs_itrace_ref(ip) \ 319#define xfs_itrace_ref(ip) \
318 _xfs_itrace_ref(ip, __FILE__, __LINE__, (inst_t *)__return_address) 320 _xfs_itrace_ref(ip, __FILE__, __LINE__, (inst_t *)__return_address)
319 321
320#else 322#else
321#define xfs_itrace_entry(a) 323#define xfs_itrace_entry(a)
322#define xfs_itrace_exit(a) 324#define xfs_itrace_exit(a)
325#define xfs_itrace_exit_tag(a, b)
323#define xfs_itrace_hold(a, b, c, d) 326#define xfs_itrace_hold(a, b, c, d)
324#define xfs_itrace_ref(a) 327#define xfs_itrace_ref(a)
325#define xfs_itrace_rele(a, b, c, d) 328#define xfs_itrace_rele(a, b, c, d)
diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c
index 5363025ded7e..f77bda1473b7 100644
--- a/fs/xfs/xfs_iget.c
+++ b/fs/xfs/xfs_iget.c
@@ -157,8 +157,7 @@ again:
157 goto again; 157 goto again;
158 } 158 }
159 159
160 _xfs_itrace_exit(ip, "xfs_iget.alloc", 160 xfs_itrace_exit_tag(ip, "xfs_iget.alloc");
161 (inst_t *)__return_address);
162 161
163 XFS_STATS_INC(xs_ig_found); 162 XFS_STATS_INC(xs_ig_found);
164 163
@@ -212,8 +211,7 @@ finish_inode:
212 xfs_ilock(ip, lock_flags); 211 xfs_ilock(ip, lock_flags);
213 212
214 xfs_iflags_clear(ip, XFS_ISTALE); 213 xfs_iflags_clear(ip, XFS_ISTALE);
215 _xfs_itrace_exit(ip, "xfs_iget.found", 214 xfs_itrace_exit_tag(ip, "xfs_iget.found");
216 (inst_t *)__return_address);
217 goto return_ip; 215 goto return_ip;
218 } 216 }
219 217
@@ -234,7 +232,7 @@ finish_inode:
234 return error; 232 return error;
235 } 233 }
236 234
237 _xfs_itrace_exit(ip, "xfs_iget.alloc", (inst_t *)__return_address); 235 xfs_itrace_exit_tag(ip, "xfs_iget.alloc");
238 236
239 xfs_inode_lock_init(ip, vp); 237 xfs_inode_lock_init(ip, vp);
240 xfs_iocore_inode_init(ip); 238 xfs_iocore_inode_init(ip);