From patchwork Mon Mar 25 18:47:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 10869907 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7247E139A for ; Mon, 25 Mar 2019 18:45:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A0F429189 for ; Mon, 25 Mar 2019 18:45:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C1A029194; Mon, 25 Mar 2019 18:45:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E875529189 for ; Mon, 25 Mar 2019 18:45:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730421AbfCYSpy (ORCPT ); Mon, 25 Mar 2019 14:45:54 -0400 Received: from mx2.suse.de ([195.135.220.15]:39108 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730411AbfCYSpw (ORCPT ); Mon, 25 Mar 2019 14:45:52 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 5ECE0AF94 for ; Mon, 25 Mar 2019 18:45:51 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id C7BBADA98F; Mon, 25 Mar 2019 19:47:04 +0100 (CET) From: David Sterba To: linux-btrfs@vger.kernel.org Cc: David Sterba Subject: [PATCH 22/30] btrfs: tree-checker: get fs_info from eb in check_leaf Date: Mon, 25 Mar 2019 19:47:04 +0100 Message-Id: <7e571eee20d8d8dc026bc793badbec562e30fab6.1553539114.git.dsterba@suse.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We can read fs_info from extent buffer and can drop it from the parameters. Signed-off-by: David Sterba --- fs/btrfs/tree-checker.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c index 0330e2d27afb..dd37d23ae8ba 100644 --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c @@ -474,9 +474,10 @@ static int check_leaf_item(struct extent_buffer *leaf, return ret; } -static int check_leaf(struct btrfs_fs_info *fs_info, struct extent_buffer *leaf, - bool check_item_data, bool check_empty_leaf) +static int check_leaf(struct extent_buffer *leaf, bool check_item_data, + bool check_empty_leaf) { + struct btrfs_fs_info *fs_info = leaf->fs_info; /* No valid key type is 0, so all key should be larger than this key */ struct btrfs_key prev_key = {0, 0, 0}; struct btrfs_key key; @@ -643,13 +644,13 @@ static int check_leaf(struct btrfs_fs_info *fs_info, struct extent_buffer *leaf, int btrfs_check_leaf_full(struct btrfs_fs_info *fs_info, struct extent_buffer *leaf) { - return check_leaf(fs_info, leaf, true, true); + return check_leaf(leaf, true, true); } int btrfs_check_leaf_relaxed(struct btrfs_fs_info *fs_info, struct extent_buffer *leaf) { - return check_leaf(fs_info, leaf, false, true); + return check_leaf(leaf, false, true); } /* @@ -660,7 +661,7 @@ int btrfs_check_leaf_relaxed(struct btrfs_fs_info *fs_info, int btrfs_check_leaf_write(struct btrfs_fs_info *fs_info, struct extent_buffer *leaf) { - return check_leaf(fs_info, leaf, false, false); + return check_leaf(leaf, false, false); } int btrfs_check_node(struct btrfs_fs_info *fs_info, struct extent_buffer *node)