---

yaml
---
r: 147763
b: refs/heads/master
c: 5d4f98a
h: refs/heads/master
i:
  147761: df81fe5
  147759: 38654aa
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c939df56c3ea018b58e5aa76181284c2053d699
+refs/heads/master: 5d4f98a28c7d334091c1b7744f48a1acdd2a4ae0

trunk/fs/btrfs/Makefile

@@ -6,5 +6,5 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
 	   transaction.o inode.o file.o tree-defrag.o \
 	   extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \
 	   extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \
-	   ref-cache.o export.o tree-log.o acl.o free-space-cache.o zlib.o \
-	   compression.o delayed-ref.o
+	   export.o tree-log.o acl.o free-space-cache.o zlib.o \
+	   compression.o delayed-ref.o relocation.o

trunk/fs/btrfs/btrfs_inode.h

@@ -72,6 +72,9 @@ struct btrfs_inode {
 	 */
 	struct list_head ordered_operations;
 
+	/* node for the red-black tree that links inodes in subvolume root */
+	struct rb_node rb_node;
+
 	/* the space_info for where this inode's data allocations are done */
 	struct btrfs_space_info *space_info;