Merge branch 'allocator' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs...

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

diff --cc fs/btrfs/super.c
Simple merge

diff --cc fs/btrfs/volumes.c
index cd0b31a,ab55bfc..f777145
--- 1/fs/btrfs/volumes.c
--- 2/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@@ -2593,13 -2490,14 +2446,14 @@@ static int __btrfs_alloc_chunk(struct b
        map->sub_stripes = sub_stripes;
  
        *map_ret = map;
-       *stripe_size = calc_size;
-       *num_bytes = chunk_bytes_by_type(type, calc_size,
-                                        map->num_stripes, sub_stripes);
+       num_bytes = stripe_size * (num_stripes / ncopies);
+ 
+       *stripe_size_out = stripe_size;
+       *num_bytes_out = num_bytes;
  
-       trace_btrfs_chunk_alloc(info->chunk_root, map, start, *num_bytes);
+       trace_btrfs_chunk_alloc(info->chunk_root, map, start, num_bytes);
  
 -      em = alloc_extent_map(GFP_NOFS);
 +      em = alloc_extent_map();
        if (!em) {
                ret = -ENOMEM;
                goto error;

diff --cc fs/btrfs/volumes.h
Simple merge