From patchwork Thu Jan 11 05:09:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lu Fengqi X-Patchwork-Id: 10157051 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 C3CF8605BA for ; Thu, 11 Jan 2018 05:12:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B78E7286C5 for ; Thu, 11 Jan 2018 05:12:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B61FF286DB; Thu, 11 Jan 2018 05:12:00 +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 5FDCE286DE for ; Thu, 11 Jan 2018 05:12:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754017AbeAKFLs (ORCPT ); Thu, 11 Jan 2018 00:11:48 -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 S1753974AbeAKFKT (ORCPT ); Thu, 11 Jan 2018 00:10:19 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="35160351" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 11 Jan 2018 13:10:09 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 99EEB48AEA19 for ; Thu, 11 Jan 2018 13:10:09 +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:12 +0800 From: Lu Fengqi To: Subject: [PATCH 39/67] btrfs-progs: add the stack prefix for backup_total_bytes set/get function Date: Thu, 11 Jan 2018 13:09:11 +0800 Message-ID: <20180111050939.21251-40-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: 99EEB48AEA19.AE906 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_total_bytes 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 | 6 +++--- ctree.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c index 1d9fe942..51d9fda6 100644 --- a/cmds-inspect-dump-super.c +++ b/cmds-inspect-dump-super.c @@ -178,7 +178,7 @@ static void print_root_backup(struct btrfs_root_backup *backup) btrfs_stack_backup_csum_root_level(backup)); printf("\t\tbackup_total_bytes:\t%llu\n", - btrfs_backup_total_bytes(backup)); + btrfs_stack_backup_total_bytes(backup)); printf("\t\tbackup_bytes_used:\t%llu\n", btrfs_backup_bytes_used(backup)); printf("\t\tbackup_num_devices:\t%llu\n", diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c index fc63a6b6..255bdbb9 100644 --- a/cmds-inspect-dump-tree.c +++ b/cmds-inspect-dump-tree.c @@ -111,9 +111,9 @@ static void print_old_roots(struct btrfs_super_block *super) (unsigned long long)btrfs_stack_backup_fs_root(backup)); printf("\t\t%llu used %llu total %llu devices\n", - (unsigned long long)btrfs_backup_bytes_used(backup), - (unsigned long long)btrfs_backup_total_bytes(backup), - (unsigned long long)btrfs_backup_num_devices(backup)); + (unsigned long long)btrfs_backup_bytes_used(backup), + (unsigned long long)btrfs_stack_backup_total_bytes(backup), + (unsigned long long)btrfs_backup_num_devices(backup)); } } diff --git a/ctree.h b/ctree.h index 406f21d8..8996c978 100644 --- a/ctree.h +++ b/ctree.h @@ -2152,7 +2152,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_csum_root_gen, struct btrfs_root_backup, csum_root_gen, 64); BTRFS_SETGET_STACK_FUNCS(stack_backup_csum_root_level, struct btrfs_root_backup, csum_root_level, 8); -BTRFS_SETGET_STACK_FUNCS(backup_total_bytes, struct btrfs_root_backup, +BTRFS_SETGET_STACK_FUNCS(stack_backup_total_bytes, struct btrfs_root_backup, total_bytes, 64); BTRFS_SETGET_STACK_FUNCS(backup_bytes_used, struct btrfs_root_backup, bytes_used, 64);