From db1b7f93b4818028d915ac3c98c0f621103bd3ba Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Tue, 6 Nov 2012 21:47:08 +0100 Subject: Btrfs-progs: bugfix for subvolume parent determination in btrfs send We missed to add the default subvolume, because it has no ROOT_BACKREF_ITEM. This made get_parent always fail for direct decendants of the default subvolume, resulting in lots of full streams where incremental streams were requested. Signed-off-by: Jan Schmidt Reviewed-by: Alexander Block --- send-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'send-utils.c') diff --git a/send-utils.c b/send-utils.c index fcde5c28..d8d39728 100644 --- a/send-utils.c +++ b/send-utils.c @@ -240,7 +240,8 @@ int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s) memcpy(&root_item, root_item_ptr, sizeof(root_item)); root_item_valid = 1; - } else if (sh->type == BTRFS_ROOT_BACKREF_KEY) { + } else if (sh->type == BTRFS_ROOT_BACKREF_KEY || + root_item_valid) { if (!root_item_valid) goto skip; @@ -274,7 +275,6 @@ int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s) subvol_uuid_search_add(s, si); root_item_valid = 0; } else { - root_item_valid = 0; goto skip; } -- cgit v1.2.3