Merge branch 'topic/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel

1 files changed, 5 insertions, 3 deletions

diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c
index bb1d58eb3982..93634a7e90e9 100644
--- a/fs/xfs/xfs_dir2.c
+++ b/fs/xfs/xfs_dir2.c
@@ -40,9 +40,9 @@
 #include "xfs_dir2_leaf.h"
 #include "xfs_dir2_block.h"
 #include "xfs_dir2_node.h"
-#include "xfs_dir2_trace.h"
 #include "xfs_error.h"
 #include "xfs_vnodeops.h"
+#include "xfs_trace.h"
 
 struct xfs_name xfs_name_dotdot = {"..", 2};
 
@@ -525,7 +525,8 @@ xfs_dir2_grow_inode(
         xfs_trans_t     *tp;
         xfs_drfsbno_t   nblks;
 
-        xfs_dir2_trace_args_s("grow_inode", args, space);
+        trace_xfs_dir2_grow_inode(args, space);
+
         dp = args->dp;
         tp = args->trans;
         mp = dp->i_mount;
@@ -703,7 +704,8 @@ xfs_dir2_shrink_inode(
         xfs_mount_t     *mp;
         xfs_trans_t     *tp;
 
-        xfs_dir2_trace_args_db("shrink_inode", args, db, bp);
+        trace_xfs_dir2_shrink_inode(args, db);
+
         dp = args->dp;
         mp = dp->i_mount;
         tp = args->trans;