From patchwork Wed Oct 12 08:12:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: robbieko X-Patchwork-Id: 9372219 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4865E60839 for ; Wed, 12 Oct 2016 08:13:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BAB829D0F for ; Wed, 12 Oct 2016 08:13:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3046E29D14; Wed, 12 Oct 2016 08:13:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D302A29D0F for ; Wed, 12 Oct 2016 08:13:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754384AbcJLINZ (ORCPT ); Wed, 12 Oct 2016 04:13:25 -0400 Received: from synology.com ([59.124.61.242]:51859 "EHLO synology.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754363AbcJLINW (ORCPT ); Wed, 12 Oct 2016 04:13:22 -0400 Received: from localhost.localdomain (unknown [10.12.12.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: robbieko@synology.com) by synology.com (Postfix) with ESMTPSA id E86B1127314F; Wed, 12 Oct 2016 16:13:12 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synology.com; s=123; t=1476259993; bh=FqOwXbSMUT6vlnBFARUMkIYSwjIHZy00u1L+ldYERmI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=c9vLfMrI4YHs28ac8TQlJHaZjqUF8sEyU7qkWx2SJumjr3yNBey9Y4Lv0hSL3/+Mp mJlB9axzqLhlxGEGLM+hU/cxUzx361bA+VUHrK9FYyqXQERis10FA08+Okz3hUgayu jbs0eGzohkKec5bIrXDcdOrPRuagJPY9JErAE+PI= From: robbieko To: linux-btrfs@vger.kernel.org Cc: Robbie Ko Subject: [PATCH 1/5] Btrfs: incremental send, fix don't skip root inode in overwrite_ref Date: Wed, 12 Oct 2016 16:12:46 +0800 Message-Id: <1476259970-1866-2-git-send-email-robbieko@synology.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476259970-1866-1-git-send-email-robbieko@synology.com> References: <1476259970-1866-1-git-send-email-robbieko@synology.com> X-MailScanner-ID: E86B1127314F.A8295 X-MailScanner: Found to be clean X-MailScanner-MCPCheck: MCP-Clean, MCP-Checker (score=0, required 80) X-MailScanner-SpamCheck: not spam (whitelisted), SpamAssassin (not cached, score=-0.891, required 4.5, ALL_TRUSTED -1.00, BAYES_40 -0.00, DKIM_SIGNED 0.10, T_DKIM_INVALID 0.01) X-MailScanner-From: robbieko@synology.com Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Robbie Ko When root dir item change, don't skip will_overwrite_ref, because root inode always exist. Example: Parent snapshot: |---- a1/ (ino 257, dir) |---- a2/ (ino 258, dir) Send snapshot: |---- a2 (ino 257, file) ERROR: rename o257-29-0 -> a2 failed: Is a directory when process 257, first rmdir (ino 257,dir), and then mkfile o257-29-0, and rename o257-29-0 -> a2, but now parent snapshot had a2(ino 258,dir), we don't ignore it. therefore is_inode_existent always return 1, and will_overwrite_ref don't check gen for root inode. Signed-off-by: Robbie Ko --- fs/btrfs/send.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index a87675f..1862f8a 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -1681,6 +1681,10 @@ static int is_inode_existent(struct send_ctx *sctx, u64 ino, u64 gen) { int ret; + if (ino == BTRFS_FIRST_FREE_OBJECTID) { + return 1; + } + ret = get_cur_inode_state(sctx, ino, gen); if (ret < 0) goto out; @@ -1866,7 +1870,7 @@ static int will_overwrite_ref(struct send_ctx *sctx, u64 dir, u64 dir_gen, * not deleted and then re-created, if it was then we have no overwrite * and we can just unlink this entry. */ - if (sctx->parent_root) { + if (sctx->parent_root && dir != BTRFS_FIRST_FREE_OBJECTID) { ret = get_inode_info(sctx->parent_root, dir, NULL, &gen, NULL, NULL, NULL, NULL); if (ret < 0 && ret != -ENOENT)