1 files changed, 19 insertions, 0 deletions

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index d3f3b43cae0b..0efc2e2f253c 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -1668,6 +1668,7 @@ static int will_overwrite_ref(struct send_ctx *sctx, u64 dir, u64 dir_gen,
                               u64 *who_ino, u64 *who_gen)
 {
         int ret = 0;
+        u64 gen;
         u64 other_inode = 0;
         u8 other_type = 0;
 
@@ -1678,6 +1679,24 @@ static int will_overwrite_ref(struct send_ctx *sctx, u64 dir, u64 dir_gen,
         if (ret <= 0)
                 goto out;
 
+        /*
+         * If we have a parent root we need to verify that the parent dir was
+         * not delted and then re-created, if it was then we have no overwrite
+         * and we can just unlink this entry.
+         */
+        if (sctx->parent_root) {
+                ret = get_inode_info(sctx->parent_root, dir, NULL, &gen, NULL,
+                                     NULL, NULL, NULL);
+                if (ret < 0 && ret != -ENOENT)
+                        goto out;
+                if (ret) {
+                        ret = 0;
+                        goto out;
+                }
+                if (gen != dir_gen)
+                        goto out;
+        }
+
         ret = lookup_dir_item_inode(sctx->parent_root, dir, name, name_len,
                         &other_inode, &other_type);
         if (ret < 0 && ret != -ENOENT)