From patchwork Thu Aug 28 02:25:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gui Hecheng X-Patchwork-Id: 4792351 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 F19E19F2A9 for ; Thu, 28 Aug 2014 02:26:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 458382010F for ; Thu, 28 Aug 2014 02:26:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4CD0D200F0 for ; Thu, 28 Aug 2014 02:26:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936118AbaH1C00 (ORCPT ); Wed, 27 Aug 2014 22:26:26 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:57221 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S933108AbaH1C0Z (ORCPT ); Wed, 27 Aug 2014 22:26:25 -0400 X-IronPort-AV: E=Sophos;i="5.04,415,1406563200"; d="scan'208";a="35174501" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 28 Aug 2014 10:23:30 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s7S2QLbg012086 for ; Thu, 28 Aug 2014 10:26:21 +0800 Received: from localhost.localdomain (10.167.226.111) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Thu, 28 Aug 2014 10:26:31 +0800 From: Gui Hecheng To: CC: Gui Hecheng Subject: [PATCH 2/3] btrfs-progs: fix next_leaf in restore as it improperly skips some slots Date: Thu, 28 Aug 2014 10:25:54 +0800 Message-ID: <1409192755-1826-2-git-send-email-guihc.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1409192755-1826-1-git-send-email-guihc.fnst@cn.fujitsu.com> References: <1409192755-1826-1-git-send-email-guihc.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.111] 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, RCVD_IN_DNSWL_HI, 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 When entering the next level node, the @next_leaf in restore forgets to start at the first slot. Just reset it to the first one. Signed-off-by: Gui Hecheng --- cmds-restore.c | 1 + 1 file changed, 1 insertion(+) diff --git a/cmds-restore.c b/cmds-restore.c index e94592c..918f1fb 100644 --- a/cmds-restore.c +++ b/cmds-restore.c @@ -191,6 +191,7 @@ again: level++; if (level == BTRFS_MAX_LEVEL) return 1; + offset = 1; continue; }