From patchwork Thu Jan 11 05:08:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lu Fengqi X-Patchwork-Id: 10157071 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A4AC4605BA for ; Thu, 11 Jan 2018 05:12:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9784D28627 for ; Thu, 11 Jan 2018 05:12:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C5B4286C7; Thu, 11 Jan 2018 05:12:25 +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=-6.9 required=2.0 tests=BAYES_00,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 EEE28286C4 for ; Thu, 11 Jan 2018 05:12:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932095AbeAKFMW (ORCPT ); Thu, 11 Jan 2018 00:12:22 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:44389 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753956AbeAKFKN (ORCPT ); Thu, 11 Jan 2018 00:10:13 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="35160327" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 11 Jan 2018 13:10:02 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id DF7BC48AEA0B for ; Thu, 11 Jan 2018 13:10:00 +0800 (CST) Received: from localhost.localdomain (10.167.226.155) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.361.1; Thu, 11 Jan 2018 13:10:03 +0800 From: Lu Fengqi To: Subject: [PATCH 22/67] btrfs-progs: add the stack prefix for backup_tree_root_gen set/get function Date: Thu, 11 Jan 2018 13:08:54 +0800 Message-ID: <20180111050939.21251-23-lufq.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180111050939.21251-1-lufq.fnst@cn.fujitsu.com> References: <20180111050939.21251-1-lufq.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.155] X-yoursite-MailScanner-ID: DF7BC48AEA0B.AD949 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: lufq.fnst@cn.fujitsu.com 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 The backup_tree_root_gen set/get function defined by BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack. Signed-off-by: Lu Fengqi --- cmds-inspect-dump-super.c | 2 +- cmds-inspect-dump-tree.c | 2 +- ctree.h | 2 +- disk-io.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c index a9962ee3..69b4da4e 100644 --- a/cmds-inspect-dump-super.c +++ b/cmds-inspect-dump-super.c @@ -154,7 +154,7 @@ static void print_root_backup(struct btrfs_root_backup *backup) { printf("\t\tbackup_tree_root:\t%llu\tgen: %llu\tlevel: %d\n", btrfs_stack_backup_tree_root(backup), - btrfs_backup_tree_root_gen(backup), + btrfs_stack_backup_tree_root_gen(backup), btrfs_backup_tree_root_level(backup)); printf("\t\tbackup_chunk_root:\t%llu\tgen: %llu\tlevel: %d\n", btrfs_backup_chunk_root(backup), diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c index bb94ae8f..326c8f90 100644 --- a/cmds-inspect-dump-tree.c +++ b/cmds-inspect-dump-tree.c @@ -87,7 +87,7 @@ static void print_old_roots(struct btrfs_super_block *super) backup = super->super_roots + i; printf("btrfs root backup slot %d\n", i); printf("\ttree root gen %llu block %llu\n", - (unsigned long long)btrfs_backup_tree_root_gen(backup), + (unsigned long long)btrfs_stack_backup_tree_root_gen(backup), (unsigned long long)btrfs_stack_backup_tree_root(backup)); printf("\t\textent root gen %llu block %llu\n", diff --git a/ctree.h b/ctree.h index 189c1b0c..7acc7620 100644 --- a/ctree.h +++ b/ctree.h @@ -2111,7 +2111,7 @@ static inline struct btrfs_timespec* btrfs_root_rtime( /* struct btrfs_root_backup */ BTRFS_SETGET_STACK_FUNCS(stack_backup_tree_root, struct btrfs_root_backup, tree_root, 64); -BTRFS_SETGET_STACK_FUNCS(backup_tree_root_gen, struct btrfs_root_backup, +BTRFS_SETGET_STACK_FUNCS(stack_backup_tree_root_gen, struct btrfs_root_backup, tree_root_gen, 64); BTRFS_SETGET_STACK_FUNCS(backup_tree_root_level, struct btrfs_root_backup, tree_root_level, 8); diff --git a/disk-io.c b/disk-io.c index 8d226e38..ef147a40 100644 --- a/disk-io.c +++ b/disk-io.c @@ -800,10 +800,10 @@ static int find_best_backup_root(struct btrfs_super_block *super) for (i = 0; i < BTRFS_NUM_BACKUP_ROOTS; i++) { backup = super->super_roots + i; - if (btrfs_backup_tree_root_gen(backup) != orig_gen && - btrfs_backup_tree_root_gen(backup) > gen) { + if (btrfs_stack_backup_tree_root_gen(backup) != orig_gen && + btrfs_stack_backup_tree_root_gen(backup) > gen) { best_index = i; - gen = btrfs_backup_tree_root_gen(backup); + gen = btrfs_stack_backup_tree_root_gen(backup); } } return best_index; @@ -860,7 +860,7 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info, u64 root_tree_bytenr, } backup = fs_info->super_copy->super_roots + index; root_tree_bytenr = btrfs_stack_backup_tree_root(backup); - generation = btrfs_backup_tree_root_gen(backup); + generation = btrfs_stack_backup_tree_root_gen(backup); } root->node = read_tree_block(fs_info, root_tree_bytenr, generation);