aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ctree.h
diff options
context:
space:
mode:
authorJosef Bacik <jbacik@fusionio.com>2013-08-16 16:52:55 -0400
committerChris Mason <chris.mason@fusionio.com>2013-09-01 08:15:44 -0400
commitba5e8f2e2d3074bf151dd222dae9bb400e621b82 (patch)
tree626f84ad5ec8836f08e6f712e72cc65cb7a8a8fc /fs/btrfs/ctree.h
parentdc11dd5d707a4157882f281c96055d6894d10c8c (diff)
Btrfs: fix send issues related to inode number reuse
If you are sending a snapshot and specifying a parent snapshot we will walk the trees and figure out where they differ and send the differences only. The way we check for differences are if the leaves aren't the same and if the keys are not the same within the leaves. So if neither leaf is the same (ie the leaf has been cow'ed from the parent snapshot) we walk each item in the send root and check it against the parent root. If the items match exactly then we don't do anything. This doesn't quite work for inode refs, since they will just have the name and the parent objectid. If you move the file from a directory and then remove that directory and re-create a directory with the same inode number as the old directory and then move that file back into that directory we will assume that nothing changed and you will get errors when you try to receive. In order to fix this we need to do extra checking to see if the inode ref really is the same or not. So do this by passing down BTRFS_COMPARE_TREE_SAME if the items match. Then if the key type is an inode ref we can do some extra checking, otherwise we just keep processing. The extra checking is to look up the generation of the directory in the parent volume and compare it to the generation of the send volume. If they match then they are the same directory and we are good to go. If they don't we have to add them to the changed refs list. This means we have to track the generation of the ref we're trying to lookup when we iterate all the refs for a particular inode. So in the case of looking for new refs we have to get the generation from the parent volume, and in the case of looking for deleted refs we have to get the generation from the send volume to compare with. There was also the issue of using a ulist to keep track of the directories we needed to check. Because we can get a deleted ref and a new ref for the same inode number the ulist won't work since it indexes based on the value. So instead just dup any directory ref we find and add it to a local list, and then process that list as normal and do away with using a ulist for this altogether. Before we would fail all of the tests in the far-progs that related to moving directories (test group 32). With this patch we now pass these tests, and all of the tests in the far-progs send testing suite. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/ctree.h')
-rw-r--r--fs/btrfs/ctree.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 7c93d9f13812..9766e9f04024 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3301,6 +3301,7 @@ enum btrfs_compare_tree_result {
3301 BTRFS_COMPARE_TREE_NEW, 3301 BTRFS_COMPARE_TREE_NEW,
3302 BTRFS_COMPARE_TREE_DELETED, 3302 BTRFS_COMPARE_TREE_DELETED,
3303 BTRFS_COMPARE_TREE_CHANGED, 3303 BTRFS_COMPARE_TREE_CHANGED,
3304 BTRFS_COMPARE_TREE_SAME,
3304}; 3305};
3305typedef int (*btrfs_changed_cb_t)(struct btrfs_root *left_root, 3306typedef int (*btrfs_changed_cb_t)(struct btrfs_root *left_root,
3306 struct btrfs_root *right_root, 3307 struct btrfs_root *right_root,