From patchwork Sun Jan 31 12:34:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 75971 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o0VCYPXW020198 for ; Sun, 31 Jan 2010 12:34:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752990Ab0AaMeX (ORCPT ); Sun, 31 Jan 2010 07:34:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752889Ab0AaMeW (ORCPT ); Sun, 31 Jan 2010 07:34:22 -0500 Received: from mail-px0-f182.google.com ([209.85.216.182]:63681 "EHLO mail-px0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752564Ab0AaMeV convert rfc822-to-8bit (ORCPT ); Sun, 31 Jan 2010 07:34:21 -0500 Received: by pxi12 with SMTP id 12so3251771pxi.33 for ; Sun, 31 Jan 2010 04:34:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=nXP20tD6ARayqQ5alrSs3UEUZsLTAY1FnnQEWX4CQ2g=; b=roaYBKzwjoVRoUut4n0UM2wUCQRkwGX1KVwpILNh1L0kTLZ/4G3Ye+hq1PGRDEdSes 4rXIUsx+f0RMDhi8QX2Qa2JmYWRZXd+wSHDRt2t0ZdZWAAgzc3WcQIUlcY3k+pQDuFXE dD6Os9fIGPtFz7fdC7X9DY6GODD5NUcE589ZY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=ancLZe1A1vFkosUKyH5dA7YZ0PsevOcDH4ZczewRyrXgQUImBTa3b5A6jagO0mAA1l NYjazbofeK9FDpkp3zU11mRtZCpSIr1Xfe51/KUYy4ic2L+oHrEhHz+hBMIKbwOzJibN lIwdyJ1mqOAzXjqRL7tOHvfzm+8RBwfSNjMUs= MIME-Version: 1.0 Received: by 10.115.101.40 with SMTP id d40mr2202386wam.95.1264941260084; Sun, 31 Jan 2010 04:34:20 -0800 (PST) In-Reply-To: <4B6556C9.7060809@gmail.com> References: <4B63CC39.1020505@gmail.com> <3d0408631001300409i13326d13vac10a3f639f6db92@mail.gmail.com> <4B646D08.1020307@gmail.com> <3d0408631001301800y5de8a412w1d29bdb5e5e79f84@mail.gmail.com> <4B6556C9.7060809@gmail.com> Date: Sun, 31 Jan 2010 20:34:20 +0800 X-Google-Sender-Auth: bf1f752d95c5e403 Message-ID: <3d0408631001310434g35b1fa4cp8a42068ef5fa5a34@mail.gmail.com> Subject: Re: panic during rebalance, and now upon mount From: "Yan, Zheng " To: Troy Ablan Cc: linux-btrfs@vger.kernel.org Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 31 Jan 2010 12:34:26 +0000 (UTC) diff -urp 1/fs/btrfs/extent-tree.c 2/fs/btrfs/extent-tree.c --- 1/fs/btrfs/extent-tree.c 2010-01-22 12:16:34.203525744 +0800 +++ 2/fs/btrfs/extent-tree.c 2010-01-31 20:09:08.509200892 +0800 @@ -5402,14 +5402,14 @@ static noinline int walk_down_tree(struc int ret; while (level >= 0) { - if (path->slots[level] >= - btrfs_header_nritems(path->nodes[level])) - break; - ret = walk_down_proc(trans, root, path, wc, lookup_info); if (ret > 0) break; + if (path->slots[level] >= + btrfs_header_nritems(path->nodes[level])) + break; + if (level == 0) break;