From: Robbie Ko <robbieko@xxxxxxxxxxxx>
There a some case similar as before.
add check generation if has waiting_dir_move in the will_overwrite_ref
Signed-off-by: Robbie Ko <robbieko@xxxxxxxxxxxx>
---
fs/btrfs/send.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index e090db2..92b7518 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -1858,6 +1858,7 @@ static int will_overwrite_ref(struct send_ctx *sctx, u64 dir, u64 dir_gen,
u64 gen;
u64 other_inode = 0;
u8 other_type = 0;
+ struct waiting_dir_move *dm = NULL;
if (!sctx->parent_root)
goto out;
@@ -1899,11 +1900,15 @@ static int will_overwrite_ref(struct send_ctx *sctx, u64 dir, u64 dir_gen,
* overwrite anything at this point in time.
*/
if (other_inode > sctx->send_progress ||
- is_waiting_for_move(sctx, other_inode)) {
+ ((dm = get_waiting_dir_move(sctx, other_inode)) != NULL)) {
ret = get_inode_info(sctx->parent_root, other_inode, NULL,
who_gen, NULL, NULL, NULL, NULL);
if (ret < 0)
goto out;
+ if (dm && dm->gen != *who_gen) {
+ ret = 0;
+ goto out;
+ }
ret = 1;
*who_ino = other_inode;
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
