From: robbieko <robbieko@synology.com>
To: linux-btrfs@vger.kernel.org
Cc: Robbie Ko <robbieko@synology.com>
Subject: [PATCH 5/5] Btrfs: incremental send, add gen check if has waiting_dir_move in the will_overwrite_ref
Date: Wed, 12 Oct 2016 16:12:50 +0800 [thread overview]
Message-ID: <1476259970-1866-6-git-send-email-robbieko@synology.com> (raw)
In-Reply-To: <1476259970-1866-1-git-send-email-robbieko@synology.com>
From: Robbie Ko <robbieko@synology.com>
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@synology.com>
---
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
next prev parent reply other threads:[~2016-10-12 8:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-12 8:12 [PATCH 0/5] Btrfs: incremental send, fix serval case for root and gen robbieko
2016-10-12 8:12 ` [PATCH 1/5] Btrfs: incremental send, fix don't skip root inode in overwrite_ref robbieko
2016-10-12 9:09 ` Filipe Manana
2016-10-12 8:12 ` [PATCH 2/5] Btrfs: incremental send, add gen for is_waiting_for_rm when some corner case robbieko
2016-10-12 9:11 ` Filipe Manana
2016-10-12 8:12 ` [PATCH 3/5] Btrfs: incremental send, add gen in waiting_dir_move for " robbieko
2016-10-12 9:13 ` Filipe Manana
2016-10-12 8:12 ` [PATCH 4/5] Btrfs: incremental send, add gen check in did_overwrite_ref robbieko
2016-10-12 9:14 ` Filipe Manana
2016-10-12 8:12 ` robbieko [this message]
2016-10-12 9:15 ` [PATCH 5/5] Btrfs: incremental send, add gen check if has waiting_dir_move in the will_overwrite_ref Filipe Manana
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476259970-1866-6-git-send-email-robbieko@synology.com \
--to=robbieko@synology.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.