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>

fs/btrfs/inode-map.c

@@ -86,7 +86,7 @@ again:
 				 * in the next search.
 				 */
 				btrfs_item_key_to_cpu(leaf, &key, 0);
-				btrfs_release_path(root, path);
+				btrfs_release_path(path);
 				root->cache_progress = last;
 				mutex_unlock(&root->fs_commit_mutex);
 				schedule_timeout(1);