From: robbieko <robbieko@synology.com>
To: linux-btrfs@vger.kernel.org
Cc: Robbie Ko <robbieko@synology.com>
Subject: [PATCH v2 4/6] Btrfs: incremental send, skip check overwritten if parents' generation are different
Date: Fri, 28 Oct 2016 09:40:48 +0800 [thread overview]
Message-ID: <1477618850-12922-5-git-send-email-robbieko@synology.com> (raw)
In-Reply-To: <1477618850-12922-1-git-send-email-robbieko@synology.com>
From: Robbie Ko <robbieko@synology.com>
Example scenario:
Parent snapshot:
|---- d259_old/ (ino 259, gen 96)
|---- d1/ (ino 258, gen 96)
|---- f (ino 257, gen 96)
Send snapshot:
|---- d258/ (ino 258, gen 98)
|---- d259/ (ino 259, gen 98)
|---- d1/ (ino 257, gen 98)
unlink f
mkdir o257-98-0
mkdir o259-98-0
chown o257-98-0 - uid=0, gid=0
chmod o257-98-0 - mode=0755
rmdir o258-96-0
ERROR: rmdir o258-96-0 failed: No such file or directory
While computing the send stream the following steps happen:
1) While processing inode 257 we create o257-98-0 and o259-98-0,
then delay o257-98-0 rename operation because its new parent
in the send snapshot, inode 259, was not yet processed and therefore
not yet renamed;
2) Later we want to delete d1 (ino 258, gen 96) while processing inode
258. In order to get its path for delete, we need to check if it is
overwritten in the send snapshot. And we find it is overwritten so
we delete it via unique name , which leads to error. The reason is
we will find out d1 is under parent directory (inode 259) in the send
snapshot, and for this case, because d1(inode 257, gen 98) is not same
as d1 (inode 258, gen 96), we conclude d1 has been overwritten.
Fix this by adding generation check for the parent directory. Because
both parent directory are not identical, we can just skip the overwrite
check. In addition, inode 256 should not check for this since it is a
subvolume.
Signed-off-by: Robbie Ko <robbieko@synology.com>
---
fs/btrfs/send.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index eaf1c92..139f492 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -1938,6 +1938,19 @@ static int did_overwrite_ref(struct send_ctx *sctx,
if (ret <= 0)
goto out;
+ if (dir != BTRFS_FIRST_FREE_OBJECTID) {
+ ret = get_inode_info(sctx->send_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;
+ }
+
/* check if the ref was overwritten by another ref */
ret = lookup_dir_item_inode(sctx->send_root, dir, name, name_len,
&ow_inode, &other_type);
--
1.9.1
next prev parent reply other threads:[~2016-10-28 1:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-28 1:40 [PATCH v2 0/6] Btrfs: incremental send, fix serval case for inode 256 and generation robbieko
2016-10-28 1:40 ` [PATCH v2 1/6] Btrfs: incremental send, do not skip generation inconsistency check for inode 256 robbieko
2016-10-28 1:40 ` [PATCH v2 2/6] Btrfs: incremental send, add generation check for the inode waiting for rmdir operation robbieko
2016-10-28 1:40 ` [PATCH v2 3/6] Btrfs: incremental send, add generation for waiting_dir_move struct and check it in can_rmdir robbieko
2016-10-28 15:13 ` Filipe Manana
2016-10-28 1:40 ` robbieko [this message]
2016-10-28 1:40 ` [PATCH v2 5/6] Btrfs: incremental send, add generation check for inode is waiting for move robbieko
2016-10-28 1:40 ` [PATCH v2 6/6] Btrfs: incremental send, add generation check in existence demtermination for the parent directory robbieko
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=1477618850-12922-5-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).