diff --git a/[refs] b/[refs]
index df02c35ed4c2..e271a345bdd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d13d8d065cc7bbee6b1ad6ee3fe965d66badfe6
+refs/heads/master: cac87faa09f56776602d4b6f15c1bd44f6da300e
diff --git a/trunk/fs/btrfs/TODO b/trunk/fs/btrfs/TODO
index 4cd11a1b4b32..1c3acfcf146e 100644
--- a/trunk/fs/btrfs/TODO
+++ b/trunk/fs/btrfs/TODO
@@ -6,9 +6,7 @@
 * Make sure nobh stuff is working properly for cows
 * Do actual block accounting
 * Check compat and incompat flags on the inode
-* Add virtual filesystems, mountable snapshots
 * Get rid of struct ctree_path, limiting tree levels held at one time
-* EEXIST for dirs instead of hash overflow
 * Release
 * Do real tree locking
 * Add extent mirroring (backup copies of blocks)
@@ -20,10 +18,3 @@
 * fsck
 * Scrub & defrag
 
----
-metata FS ideas:
-mount metadata FS on /sys/fs/btrfs/dev/
-subvolumes in /sys/fs/btrfs/dev/fs/
-snapshots in /sys/fs/btrfs/dev/fs/snapshots
-mount -o bind
-ioctl to create a snapshot
diff --git a/trunk/fs/btrfs/ctree.h b/trunk/fs/btrfs/ctree.h
index 0ba560f0d2a6..3f3a23f52a3b 100644
--- a/trunk/fs/btrfs/ctree.h
+++ b/trunk/fs/btrfs/ctree.h
@@ -15,7 +15,8 @@ extern struct kmem_cache *btrfs_path_cachep;
 #define BTRFS_ROOT_TREE_OBJECTID 1ULL
 #define BTRFS_EXTENT_TREE_OBJECTID 2ULL
 #define BTRFS_FS_TREE_OBJECTID 3ULL
-#define BTRFS_FIRST_FREE_OBJECTID 4ULL
+#define BTRFS_ROOT_TREE_DIR_OBJECTID 4ULL
+#define BTRFS_FIRST_FREE_OBJECTID 5ULL
 
 /*
  * we can actually store much bigger names, but lets not confuse the rest