Merge branch 'cleanups' of git://repo.or.cz/linux-2.6/btrfs-unstable into inode_numbers

Conflicts:
	fs/btrfs/extent-tree.c
	fs/btrfs/free-space-cache.c
	fs/btrfs/inode.c
	fs/btrfs/tree-log.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index e757202a014e..1ddfca78e910 100644
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -176,7 +176,7 @@ second_insert:
                 ret = 0;
                 goto out_free;
         }
-        btrfs_release_path(root, path);
+        btrfs_release_path(path);
 
         ret2 = btrfs_insert_delayed_dir_index(trans, root, name, name_len, dir,
                                               &disk_key, type, index);