Merge branch 'for-chris' of git://github.com/sensille/linux into integration

Conflicts:
	fs/btrfs/ctree.h

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

diff --cc fs/btrfs/ctree.h
index 6bb34fc1ff226eeba1f0f791867020ce9c9a36ae,370af767440d664133c07d6667a94635a3449412..b9ba59ff9292559330745b8afb41eefacfbf1615
--- 1/fs/btrfs/ctree.h
--- 2/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@@ -1158,8 -1121,9 +1159,12 @@@ struct btrfs_fs_info 
  
        struct btrfs_delayed_root *delayed_root;
  
+       /* readahead tree */
+       spinlock_t reada_lock;
+       struct radix_tree_root reada_tree;
++
 +      /* next backup root to be overwritten */
 +      int backup_root_index;
  };
  
  /*

diff --cc fs/btrfs/disk-io.c
index 23b6776477b73ed04adc180c77028a387db5d177,2151828aa1423fb6551129776e04907f2b875282..cedfbfb278eb6c7d7edb602d1ea42b1cd23b4efa
--- 1/fs/btrfs/disk-io.c
--- 2/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@@ -1902,8 -1746,11 +1971,12 @@@ struct btrfs_root *open_ctree(struct su
        fs_info->metadata_ratio = 0;
        fs_info->defrag_inodes = RB_ROOT;
        fs_info->trans_no_join = 0;
 +      fs_info->free_chunk_space = 0;
  
+       /* readahead state */
+       INIT_RADIX_TREE(&fs_info->reada_tree, GFP_NOFS & ~__GFP_WAIT);
+       spin_lock_init(&fs_info->reada_lock);
+ 
        fs_info->thread_pool_size = min_t(unsigned long,
                                          num_online_cpus() + 2, 8);
  

diff --cc fs/btrfs/disk-io.h
Simple merge

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

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

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

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