Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2260680imm; Mon, 28 May 2018 05:00:19 -0700 (PDT) X-Google-Smtp-Source: AB8JxZq8LYETM7cRsxKdykGBSwXGhuWnjL+omixaspHs753KuQfesYmazM+5E8S+8eHDzaIcFl/y X-Received: by 2002:a17:902:a60d:: with SMTP id u13-v6mr13475602plq.40.1527508819058; Mon, 28 May 2018 05:00:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527508819; cv=none; d=google.com; s=arc-20160816; b=PdFXn0SCmRErQJKwY9dzQq5PbKOj102P5RNBO4vQrwPB9shqhmp7ttEv1FxJniQeVC wJDUyEUZU80zjDFVHd3QMP/dO+7W0uClUR2T5uaY67OedpqBqiBDJbD9TYn8awUGyR4l cXNyeTxUGciH9/K6bxcEEOSlesZX+JSiJPdkV7r+rSSY86KRlou+NEnr0RVGlm+S/xLY gfXeMag/3VNaDatkBtMI/+AnnOgzDuiAbwt/icQIElyP2f3gmz85z8ZzaPVh8fpawYNR uC8AkYy2SAdV4/eKgGVqufA3UlBGdQ5ow+YYuqmFYcuZMN29JhoR02i/W9F7WRM0mKFn tNqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=wlhQecm2G8wHSiqhoeahGRLtZVbvAdxammiU96a5xSc=; b=fBea3icT3y4dFuMJyzs/PuqeOlA0E5AaKNOnL8b34cee+No6PxtyPGcwYLC0zQcW5G T3TOcq6D7iy2wwXtrW+xRLqcaLmjWL41QkzW8HrhHqKxtCJsAOLrnvlZXwZdZS9qlyw0 6RlTdDOnqD+EC0O35Es4NyGRTV28zjX3miqlb/OujIuf6BZPuq40jT/+2hWR7TpiRnFp ZN7OmnmDaR8yy073QRqCPKx0/mkOZpBP7ENDID/0e6GvC7dUzPiPGSmaioJm7I+PbnDu EtvLTVAqQ8T0o5Nri96/gFeZQI5Hny6UhWjcWVSMgvWpPNmFPrzXQ2WScNh4R+8NhD/e WUIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DC650En2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q23-v6si4045309pls.101.2018.05.28.05.00.03; Mon, 28 May 2018 05:00:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DC650En2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938471AbeE1L6R (ORCPT + 99 others); Mon, 28 May 2018 07:58:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:55212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423513AbeE1LIA (ORCPT ); Mon, 28 May 2018 07:08:00 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D7BDB206B7; Mon, 28 May 2018 11:07:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527505679; bh=Gg4UzuIRGI+6rOhZoKkwtNGKjgyPAk5bzRaZFMagKOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DC650En2Exo1P73zyPmrJwZgEJxhCtt4RXv3oGuPmqVwPN2pJPLNkIaIgXU65x0CV BrpwJm2FaMQsc7RMuLOGMeKO3St7dO6usjHYLjYq6VaXMCNaO35C/ntIykkWmyTc1K w15hTm9Kpn/RrEDGcY2hCfnT9pC8Vnd+nd0OVfUI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qu Wenruo , David Sterba , Sasha Levin Subject: [PATCH 4.16 090/272] btrfs: tests/qgroup: Fix wrong tree backref level Date: Mon, 28 May 2018 12:02:03 +0200 Message-Id: <20180528100248.710989626@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100240.256525891@linuxfoundation.org> References: <20180528100240.256525891@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Qu Wenruo [ Upstream commit 3c0efdf03b2d127f0e40e30db4e7aa0429b1b79a ] The extent tree of the test fs is like the following: BTRFS info (device (null)): leaf 16327509003777336587 total ptrs 1 free space 3919 item 0 key (4096 168 4096) itemoff 3944 itemsize 51 extent refs 1 gen 1 flags 2 tree block key (68719476736 0 0) level 1 ^^^^^^^ ref#0: tree block backref root 5 And it's using an empty tree for fs tree, so there is no way that its level can be 1. For REAL (created by mkfs) fs tree backref with no skinny metadata, the result should look like: item 3 key (30408704 EXTENT_ITEM 4096) itemoff 3845 itemsize 51 refs 1 gen 4 flags TREE_BLOCK tree block key (256 INODE_ITEM 0) level 0 ^^^^^^^ tree block backref root 5 Fix the level to 0, so it won't break later tree level checker. Fixes: faa2dbf004e8 ("Btrfs: add sanity tests for new qgroup accounting code") Signed-off-by: Qu Wenruo Signed-off-by: David Sterba Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/tests/qgroup-tests.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/btrfs/tests/qgroup-tests.c +++ b/fs/btrfs/tests/qgroup-tests.c @@ -63,7 +63,7 @@ static int insert_normal_tree_ref(struct btrfs_set_extent_generation(leaf, item, 1); btrfs_set_extent_flags(leaf, item, BTRFS_EXTENT_FLAG_TREE_BLOCK); block_info = (struct btrfs_tree_block_info *)(item + 1); - btrfs_set_tree_block_level(leaf, block_info, 1); + btrfs_set_tree_block_level(leaf, block_info, 0); iref = (struct btrfs_extent_inline_ref *)(block_info + 1); if (parent > 0) { btrfs_set_extent_inline_ref_type(leaf, iref,