btrfs-progs: Remove unneeded assert in find_good_parent().
authorQu Wenruo <quwenruo@cn.fujitsu.com>
Mon, 12 May 2014 01:39:42 +0000 (09:39 +0800)
committerDavid Sterba <dsterba@suse.cz>
Fri, 22 Aug 2014 12:39:31 +0000 (14:39 +0200)
find_good_parent() uses assert to deal with the problem that clone
source's parent can't be found.
But in fact the assert is somewhat overkilled since subvol_uuid_search()
has enough error messages for debug and caller of find_good_parent() can
handle the problems in find_good_parent(), so the assert can be removed
without any problem.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
cmds-send.c

index 1cd457d..2df16be 100644 (file)
@@ -129,7 +129,10 @@ static int find_good_parent(struct btrfs_send *s, u64 root_id, u64 *found)
                parent2 = subvol_uuid_search(&s->sus, s->clone_sources[i], NULL,
                                0, NULL, subvol_search_by_root_id);
 
-               assert(parent2);
+               if (!parent2) {
+                       ret = -ENOENT;
+                       goto out;
+               }
                tmp = parent2->ctransid - parent->ctransid;
                if (tmp < 0)
                        tmp *= -1;