From patchwork Thu Jan 11 05:09:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lu Fengqi X-Patchwork-Id: 10157007 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 BB1B0605BA for ; Thu, 11 Jan 2018 05:11:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AEA3828627 for ; Thu, 11 Jan 2018 05:11:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3A80286B2; Thu, 11 Jan 2018 05:11:09 +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 22F2328627 for ; Thu, 11 Jan 2018 05:11:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754175AbeAKFLH (ORCPT ); Thu, 11 Jan 2018 00:11:07 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:12011 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754091AbeAKFK3 (ORCPT ); Thu, 11 Jan 2018 00:10:29 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="35160380" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 11 Jan 2018 13:10:21 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 8C69849F0E4C for ; Thu, 11 Jan 2018 13:10:22 +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:25 +0800 From: Lu Fengqi To: Subject: [PATCH 66/67] btrfs-progs: add the stack prefix for super_uuid_tree_generation set/get function Date: Thu, 11 Jan 2018 13:09:38 +0800 Message-ID: <20180111050939.21251-67-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: 8C69849F0E4C.AB54B 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 super_uuid_tree_generation set/get function defined by BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack. Signed-off-by: Lu Fengqi --- btrfs-find-root.c | 2 +- cmds-inspect-dump-super.c | 2 +- ctree.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/btrfs-find-root.c b/btrfs-find-root.c index 08bf2781..42c9a60a 100644 --- a/btrfs-find-root.c +++ b/btrfs-find-root.c @@ -76,7 +76,7 @@ static void get_root_gen_and_level(u64 objectid, struct btrfs_fs_info *fs_info, gen = btrfs_stack_super_log_root_transid(super); break; case BTRFS_UUID_TREE_OBJECTID: - gen = btrfs_super_uuid_tree_generation(super); + gen = btrfs_stack_super_uuid_tree_generation(super); break; } if (gen != (u64)-1) { diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c index 877b3b77..299426f2 100644 --- a/cmds-inspect-dump-super.c +++ b/cmds-inspect-dump-super.c @@ -416,7 +416,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full) printf("cache_generation\t%llu\n", (unsigned long long)btrfs_stack_super_cache_generation(sb)); printf("uuid_tree_generation\t%llu\n", - (unsigned long long)btrfs_super_uuid_tree_generation(sb)); + (unsigned long long)btrfs_stack_super_uuid_tree_generation(sb)); uuid_unparse(sb->dev_item.uuid, buf); printf("dev_item.uuid\t\t%s\n", buf); diff --git a/ctree.h b/ctree.h index a7aacf40..c85aef9b 100644 --- a/ctree.h +++ b/ctree.h @@ -2208,7 +2208,8 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_csum_type, struct btrfs_super_block, csum_type, 16); BTRFS_SETGET_STACK_FUNCS(stack_super_cache_generation, struct btrfs_super_block, cache_generation, 64); -BTRFS_SETGET_STACK_FUNCS(super_uuid_tree_generation, struct btrfs_super_block, +BTRFS_SETGET_STACK_FUNCS(stack_super_uuid_tree_generation, + struct btrfs_super_block, uuid_tree_generation, 64); BTRFS_SETGET_STACK_FUNCS(super_magic, struct btrfs_super_block, magic, 64);