diff --git a/[refs] b/[refs]
index b2f54e531448..ad7308c87ad0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f28f4787c0fc37c508cfb6b7b11c00ce5072940
+refs/heads/master: 2981e225f7048b36470383bf5622c42139bd96f7
diff --git a/trunk/fs/btrfs/send.c b/trunk/fs/btrfs/send.c
index db051d17b0be..a4011a9148fd 100644
--- a/trunk/fs/btrfs/send.c
+++ b/trunk/fs/btrfs/send.c
@@ -4287,6 +4287,11 @@ static int changed_cb(struct btrfs_root *left_root,
 	if (ret < 0)
 		goto out;
 
+	/* Ignore non-FS objects */
+	if (key->objectid == BTRFS_FREE_INO_OBJECTID ||
+	    key->objectid == BTRFS_FREE_SPACE_OBJECTID)
+		goto out;
+
 	if (key->type == BTRFS_INODE_ITEM_KEY)
 		ret = changed_inode(sctx, result);
 	else if (key->type == BTRFS_INODE_REF_KEY)