From patchwork Tue Nov 3 03:23:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhaolei X-Patchwork-Id: 7540231 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D0C7DBEEA4 for ; Tue, 3 Nov 2015 07:03:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6FA7A20894 for ; Tue, 3 Nov 2015 07:03:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F6F420893 for ; Tue, 3 Nov 2015 07:03:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754051AbbKCHBM (ORCPT ); Tue, 3 Nov 2015 02:01:12 -0500 Received: from cn.fujitsu.com ([59.151.112.132]:56691 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752518AbbKCHBK (ORCPT ); Tue, 3 Nov 2015 02:01:10 -0500 Received: from bogon (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 03 Nov 2015 15:00:50 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id tA33OpZb022161 for ; Tue, 3 Nov 2015 11:24:51 +0800 Received: from localhost.localdomain (10.167.226.114) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server id 14.3.181.6; Tue, 3 Nov 2015 11:25:26 +0800 From: Zhao Lei To: CC: Zhao Lei Subject: [PATCH 2/2] btrfs-progs: Rename variables in btrfs_add_to_fsid Date: Tue, 3 Nov 2015 11:23:37 +0800 Message-ID: <2b4af96b4d18a9b78f4febbec74e17675693752b.1446520971.git.zhaolei@cn.fujitsu.com> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: <4372105ede489b71eec1af7720117900ddb6e427.1446520971.git.zhaolei@cn.fujitsu.com> References: <4372105ede489b71eec1af7720117900ddb6e427.1446520971.git.zhaolei@cn.fujitsu.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There are two total_bytes in btrfs_add_to_fsid(), local variable of total_bytes means fs_total_bytes, and device->total_bytes means device's total_bytes. And device's total_bytes in argument is named block_count in current code. This patch rename: total_bytes -> fs_total_bytes block_count -> device_total_bytes To make code more readable. Signed-off-by: Zhao Lei --- utils.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/utils.c b/utils.c index b7752df..999af43 100644 --- a/utils.c +++ b/utils.c @@ -724,7 +724,7 @@ static int zero_dev_clamped(int fd, off_t start, ssize_t len, u64 dev_size) int btrfs_add_to_fsid(struct btrfs_trans_handle *trans, struct btrfs_root *root, int fd, char *path, - u64 block_count, u32 io_width, u32 io_align, + u64 device_total_bytes, u32 io_width, u32 io_align, u32 sectorsize) { struct btrfs_super_block *disk_super; @@ -732,7 +732,7 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans, struct btrfs_device *device; struct btrfs_dev_item *dev_item; char *buf = NULL; - u64 total_bytes; + u64 fs_total_bytes; u64 num_devs; int ret; @@ -757,7 +757,7 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans, device->sector_size = sectorsize; device->fd = fd; device->writeable = 1; - device->total_bytes = block_count; + device->total_bytes = device_total_bytes; device->bytes_used = 0; device->total_ios = 0; device->dev_root = root->fs_info->dev_root; @@ -768,8 +768,8 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans, ret = btrfs_add_device(trans, root, device); BUG_ON(ret); - total_bytes = btrfs_super_total_bytes(super) + block_count; - btrfs_set_super_total_bytes(super, total_bytes); + fs_total_bytes = btrfs_super_total_bytes(super) + device_total_bytes; + btrfs_set_super_total_bytes(super, fs_total_bytes); num_devs = btrfs_super_num_devices(super) + 1; btrfs_set_super_num_devices(super, num_devs);