From: Chris Mason <chris.mason@oracle.com>
Date: Sun, 6 Nov 2011 08:05:08 +0000 (-0500)
Subject: Merge branch 'for-chris' of git://github.com/sensille/linux into integration
X-Git-Tag: firefly_0821_release~3680^2~3894^2~63
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=531f4b1ae5e0fc8c9b3f03838218e5ea178f80d3;p=firefly-linux-kernel-4.4.55.git

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>
---

531f4b1ae5e0fc8c9b3f03838218e5ea178f80d3
diff --cc fs/btrfs/ctree.h
index 6bb34fc1ff22,370af767440d..b9ba59ff9292
--- a/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 23b6776477b7,2151828aa142..cedfbfb278eb
--- a/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);