From f694d1331ce6ec34690f3d143698439e2757e0f2 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Wed, 1 Aug 2012 14:47:03 +0200 Subject: [PATCH] --- yaml --- r: 332515 b: refs/heads/master c: 2981e225f7048b36470383bf5622c42139bd96f7 h: refs/heads/master i: 332513: 5f564581ba633dc357a639dfa9cebe1dd5c25fd3 332511: 759da7c3e72f0df5c77355262a32ccba8ab66df8 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/send.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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)