From patchwork Fri Mar 21 12:45:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 3873831 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BD5B5BF540 for ; Fri, 21 Mar 2014 12:45:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DEAAA20212 for ; Fri, 21 Mar 2014 12:45:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E5698201FD for ; Fri, 21 Mar 2014 12:45:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760681AbaCUMpx (ORCPT ); Fri, 21 Mar 2014 08:45:53 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:38481 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760098AbaCUMpw (ORCPT ); Fri, 21 Mar 2014 08:45:52 -0400 Received: by mail-wi0-f174.google.com with SMTP id d1so452870wiv.1 for ; Fri, 21 Mar 2014 05:45:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=wAQqiE+tivLQkZBE5CWQd2v2NQKfnqa0dV9sQpQNS0s=; b=tC8rJx3bUuv8ZO5kmOiCh53Lj3PqoHoZPwIH5BsbmP2MAnkR6PShlRSR028RF2KVGA kpuwQfnV4clN9In48DHN+6eXCdqh08fH7orq8+8PtIAtayv41RfUjunu0Y28lDbe4KRM gbMHdkAk+pEjn622wQUYfrHWWg2rsIEg037JhsBgX7XJQpVBZfYT+r7U/savzYNurScM 8XuIBL69E6iLku0G4RfhLZGgXhHUP9Y7ZWZlJjEOuAEjtrhPsAiG9xzbREK/89LOPawI eeuxwq4s+6QsKCXQ+4ab8BtYhHBnVbg++yfnOwHYh+xOQGVGgeLi0wt2J0mWq0HA+dxT E9SA== X-Received: by 10.194.174.100 with SMTP id br4mr1428432wjc.83.1395405950770; Fri, 21 Mar 2014 05:45:50 -0700 (PDT) Received: from debian-vm3.lan (bl13-154-103.dsl.telepac.pt. [85.246.154.103]) by mx.google.com with ESMTPSA id hy8sm13046443wjb.2.2014.03.21.05.45.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Mar 2014 05:45:50 -0700 (PDT) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH] Btrfs: send, account for orphan directories when building path strings Date: Fri, 21 Mar 2014 12:45:39 +0000 Message-Id: <1395405939-8488-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If we have directories with a pending move/rename operation, we must take into account any orphan directories that got created before executing the pending move/rename. Those orphan directories are directories with an inode number higher then the current send progress and that don't exist in the parent snapshot, they are created before current progress reaches their inode number, with a generated name of the form oN-M-I and at the root of the filesystem tree, and later when progress matches their inode number, moved/renamed to their final location. Reproducer: $ mkfs.btrfs -f /dev/sdd $ mount /dev/sdd /mnt $ mkdir -p /mnt/a/b/c/d $ mkdir /mnt/a/b/e $ mv /mnt/a/b/c /mnt/a/b/e/CC $ mkdir /mnt/a/b/e/CC/d/f $ mkdir /mnt/a/g $ btrfs subvolume snapshot -r /mnt /mnt/snap1 $ btrfs send /mnt/snap1 -f /tmp/base.send $ mkdir /mnt/a/g/h $ mv /mnt/a/b/e /mnt/a/g/h/EE $ mv /mnt/a/g/h/EE/CC/d /mnt/a/g/h/EE/DD $ btrfs subvolume snapshot -r /mnt /mnt/snap2 $ btrfs send -p /mnt/snap1 /mnt/snap2 -f /tmp/incremental.send The second receive command failed with the following error: ERROR: rename a/b/e/CC/d -> o264-7-0/EE/DD failed. No such file or directory A test case for xfstests follows soon. Signed-off-by: Filipe David Borba Manana --- fs/btrfs/send.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 143fed3..ab404ff 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -3004,7 +3004,6 @@ static int apply_dir_move(struct send_ctx *sctx, struct pending_dir_move *pm) struct fs_path *from_path = NULL; struct fs_path *to_path = NULL; struct fs_path *name = NULL; - u64 orig_progress = sctx->send_progress; struct recorded_ref *cur; u64 parent_ino, parent_gen; struct waiting_dir_move *dm = NULL; @@ -3028,23 +3027,13 @@ static int apply_dir_move(struct send_ctx *sctx, struct pending_dir_move *pm) if (ret < 0) goto out; - if (parent_ino == sctx->cur_ino) { - /* child only renamed, not moved */ - ASSERT(parent_gen == sctx->cur_inode_gen); - ret = get_cur_path(sctx, sctx->cur_ino, sctx->cur_inode_gen, - from_path); - if (ret < 0) - goto out; - ret = fs_path_add_path(from_path, name); - if (ret < 0) - goto out; - } else { - /* child moved and maybe renamed too */ - sctx->send_progress = pm->ino; - ret = get_cur_path(sctx, pm->ino, pm->gen, from_path); - if (ret < 0) - goto out; - } + ret = get_cur_path(sctx, parent_ino, parent_gen, + from_path); + if (ret < 0) + goto out; + ret = fs_path_add_path(from_path, name); + if (ret < 0) + goto out; fs_path_free(name); name = NULL; @@ -3055,7 +3044,6 @@ static int apply_dir_move(struct send_ctx *sctx, struct pending_dir_move *pm) goto out; } - sctx->send_progress = sctx->cur_ino + 1; ret = get_cur_path(sctx, pm->ino, pm->gen, to_path); if (ret < 0) goto out; @@ -3113,7 +3101,6 @@ out: fs_path_free(name); fs_path_free(from_path); fs_path_free(to_path); - sctx->send_progress = orig_progress; return ret; }