diff --git a/[refs] b/[refs]
index 7163ddeb3988..8b8a370fc350 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c8e40e4064d51ec50258c4d381eb832c0b231db
+refs/heads/master: e4464facd6f1404c2baeb6798d71e34423e7aeaa
diff --git a/trunk/include/linux/exportfs.h b/trunk/include/linux/exportfs.h
index f5abd1306638..27e772cefb6a 100644
--- a/trunk/include/linux/exportfs.h
+++ b/trunk/include/linux/exportfs.h
@@ -34,6 +34,27 @@ enum fid_type {
 	 */
 	FILEID_INO32_GEN_PARENT = 2,
 
+	/*
+	 * 64 bit object ID, 64 bit root object ID,
+	 * 32 bit generation number.
+	 */
+	FILEID_BTRFS_WITHOUT_PARENT = 0x4d,
+
+	/*
+	 * 64 bit object ID, 64 bit root object ID,
+	 * 32 bit generation number,
+	 * 64 bit parent object ID, 32 bit parent generation.
+	 */
+	FILEID_BTRFS_WITH_PARENT = 0x4e,
+
+	/*
+	 * 64 bit object ID, 64 bit root object ID,
+	 * 32 bit generation number,
+	 * 64 bit parent object ID, 32 bit parent generation,
+	 * 64 bit parent root object ID.
+	 */
+	FILEID_BTRFS_WITH_PARENT_ROOT = 0x4f,
+
 	/*
 	 * 32 bit block number, 16 bit partition reference,
 	 * 16 bit unused, 32 bit generation number.