From patchwork Tue Jan 14 16:26:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 3486591 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3E7229F381 for ; Tue, 14 Jan 2014 16:26:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3D50A2021A for ; Tue, 14 Jan 2014 16:26:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 33403201C8 for ; Tue, 14 Jan 2014 16:26:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751929AbaANQ0y (ORCPT ); Tue, 14 Jan 2014 11:26:54 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:37720 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751911AbaANQ0v (ORCPT ); Tue, 14 Jan 2014 11:26:51 -0500 Received: by mail-pb0-f46.google.com with SMTP id ma3so3438498pbc.33 for ; Tue, 14 Jan 2014 08:26:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=+rWdlaEsAgjhE6zyrYI7ETq56xFrohKVyQ0rA3Z39xo=; b=tTwyW+4LpIsq1PGPy8DgRIGOv2xGZp4PPwkJnNaWAzKncqnmgVEGCQffEwocUXWHKF mgrCVuRo65QD+awUFsPI+ZfgCei4s7RAxYhUQt6R5vHxEb2h5pnpPWCdk2YJC1WFx1P4 M9uz7TLUhQ5Hvrhx2g1P8U6W0FuZoUqj3WL9HmaOsuTUnl2MLOPUU+OnyaFoG3mg+Zvn Qy4BWIu8eftu86Qq3EPHgICc4LUP/GhMfuAZa9WL7H6ZlYxTlwI2EyEAoFjUX9dWOAEs 7LTgTYNTg11HIcfkf4GgqjkN91Mv8kim2VCFSkdxI5+K353bxGIRRTtwqcYNLRFO6iQ6 HuAw== X-Received: by 10.68.98.3 with SMTP id ee3mr2771804pbb.31.1389716810905; Tue, 14 Jan 2014 08:26:50 -0800 (PST) Received: from linux-b0ol.localdomain ([223.65.189.206]) by mx.google.com with ESMTPSA id lh13sm2782922pab.4.2014.01.14.08.26.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jan 2014 08:26:50 -0800 (PST) From: Wang Shilong To: linux-btrfs@vger.kernel.org Subject: [PATCH v2] Btrfs: do not use extent commit root for sending Date: Wed, 15 Jan 2014 00:26:42 +0800 Message-Id: <1389716803-2415-1-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.8.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.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Wang Shilong Now we have kicked off transaction from btrfs send, it is not safe that we use extent commit root to search. I happended to catch this problem when running sending and snapshot in my desktop. Signed-off-by: Wang Shilong --- Changelog v1->v2: extent_from_logical() also search extent tree, we should also take care of that part. --- fs/btrfs/send.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 591063d..54665d4 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -1142,7 +1142,7 @@ static int find_extent_clone(struct send_ctx *sctx, int compressed; u32 i; - tmp_path = alloc_path_for_send(); + tmp_path = btrfs_alloc_path(); if (!tmp_path) return -ENOMEM; @@ -1225,7 +1225,7 @@ static int find_extent_clone(struct send_ctx *sctx, extent_item_pos = logical - found_key.objectid; ret = iterate_extent_inodes(sctx->send_root->fs_info, - found_key.objectid, extent_item_pos, 1, + found_key.objectid, extent_item_pos, 0, __iterate_backrefs, backref_ctx); if (ret < 0)