There's one case where we can't rmdir issue.
Example:
Parent snapshot:
|---- a/ (ino 279)
|---- c (ino 282)
|---- del/ (ino 281)
|---- tmp/ (ino 280)
|---- long/ (ino 283)
Send snapshot:
|---- a/ (ino 279)
|---- long (ino 283)
|---- c/ (ino 282)
|---- tmp/ (ino 280)
Here we process 281 use can_rmdir check, but 280 is waiting, so create
orphan_dir_info
and when 282 is move to dest, so 280 can move to c/tmp, and now run can_rmdir
check again.
Return is true, because sctx->cur_ino is 282 , and call can_rmdir(,
sctx->cur_ino + 1)
so 283 is equal or lesser than (sctx->cur_ino + 1), not anything unprocess.
So fix this rmdir for this case.
Signed-off-by: Robbie Ko <robbi...@synology.com>
---
fs/btrfs/send.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index ff9d052..e8eb3ab 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -3213,7 +3213,7 @@ static int apply_dir_move(struct send_ctx *sctx, struct
pending_dir_move *pm)
/* already deleted */
goto finish;
}
- ret = can_rmdir(sctx, rmdir_ino, odi->gen, sctx->cur_ino + 1);
+ ret = can_rmdir(sctx, rmdir_ino, odi->gen, sctx->cur_ino);
if (ret < 0)
goto out;
if (!ret)
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
