aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/send.c
diff options
context:
space:
mode:
authorAlexander Block <ablock84@googlemail.com>2012-07-28 05:46:29 -0400
committerChris Mason <chris.mason@fusionio.com>2012-10-01 15:18:47 -0400
commitccf1626b49a94d66f3bb58d634888049ac695b46 (patch)
tree0001864d120b03cf3734d5c6bdb4f4c549857bed /fs/btrfs/send.c
parent9ea3ef516d828e435d283b7d5f0de05fd72a23ac (diff)
Btrfs: add correct parent to check_dirs when dir got moved
We only added the parent for the new position of a moved dir. We also need to add the old parent of the moved dir. Reported-by: Alex Lyakas <alex.bolshoy.btrfs@gmail.com> Signed-off-by: Alexander Block <ablock84@googlemail.com>
Diffstat (limited to 'fs/btrfs/send.c')
-rw-r--r--fs/btrfs/send.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 9e3f6d127d82..328654ea4400 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -2805,6 +2805,17 @@ verbose_printk("btrfs: process_recorded_refs %llu\n", sctx->cur_ino);
2805 if (ret < 0) 2805 if (ret < 0)
2806 goto out; 2806 goto out;
2807 } 2807 }
2808 } else if (S_ISDIR(sctx->cur_inode_mode) &&
2809 !list_empty(&sctx->deleted_refs)) {
2810 /*
2811 * We have a moved dir. Add the old parent to check_dirs
2812 */
2813 cur = list_entry(sctx->deleted_refs.next, struct recorded_ref,
2814 list);
2815 ret = ulist_add(check_dirs, cur->dir, cur->dir_gen,
2816 GFP_NOFS);
2817 if (ret < 0)
2818 goto out;
2808 } else if (!S_ISDIR(sctx->cur_inode_mode)) { 2819 } else if (!S_ISDIR(sctx->cur_inode_mode)) {
2809 /* 2820 /*
2810 * We have a non dir inode. Go through all deleted refs and 2821 * We have a non dir inode. Go through all deleted refs and