linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 8/8] btrfs: rename total_bytes to avoid confusion
Date: Wed, 13 Aug 2014 14:24:26 +0800	[thread overview]
Message-ID: <1407911066-5363-8-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1407911066-5363-1-git-send-email-anand.jain@oracle.com>

we are assigning number_devices to the total_bytes,
that's very confusing for a moment

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 fs/btrfs/volumes.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index bf99e82..c0c360a 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2253,7 +2253,7 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
 	struct list_head *devices;
 	struct super_block *sb = root->fs_info->sb;
 	struct rcu_string *name;
-	u64 total_bytes;
+	u64 ret_sz;
 	int seeding_dev = 0;
 	int ret = 0;
 
@@ -2356,13 +2356,13 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
 	if (!blk_queue_nonrot(bdev_get_queue(bdev)))
 		root->fs_info->fs_devices->rotating = 1;
 
-	total_bytes = btrfs_super_total_bytes(root->fs_info->super_copy);
+	ret_sz = btrfs_super_total_bytes(root->fs_info->super_copy);
 	btrfs_set_super_total_bytes(root->fs_info->super_copy,
-				    total_bytes + device->total_bytes);
+				    ret_sz + device->total_bytes);
 
-	total_bytes = btrfs_super_num_devices(root->fs_info->super_copy);
+	ret_sz = btrfs_super_num_devices(root->fs_info->super_copy);
 	btrfs_set_super_num_devices(root->fs_info->super_copy,
-				    total_bytes + 1);
+				    ret_sz + 1);
 
 	/* add sysfs device entry */
 	btrfs_kobj_add_device(root->fs_info, device);
-- 
2.0.0.153.g79dcccc


  parent reply	other threads:[~2014-08-13  6:17 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-13  6:24 [PATCH 1/8] btrfs: preparatory to make btrfs_rm_dev_replace_srcdev() seed aware Anand Jain
2014-08-13  6:24 ` [PATCH 2/8] btrfs: replace seed device followed by unmount causes kernel WARNING Anand Jain
2014-08-19 15:44   ` David Sterba
2014-08-20  2:56   ` [PATCH 2/8 v2] " Anand Jain
2014-08-13  6:24 ` [PATCH 3/8] btrfs: fix rw_devices miss match after seed replace Anand Jain
2014-08-13  6:24 ` [PATCH 4/8 v2] btrfs: update sprout seed pointer when seed fs is relinquished Anand Jain
2014-08-13  6:24 ` [PATCH 5/8] btrfs: fix memory leak when there is no more seed device Anand Jain
2014-08-13  6:24 ` [PATCH 6/8] btrfs: rw_devices shouldn't be incremented for seed fs in btrfs_rm_dev_replace_srcdev() Anand Jain
2014-08-13  6:24 ` [PATCH 7/8] btrfs: fix typo in the log message Anand Jain
2014-08-13  6:24 ` Anand Jain [this message]
2014-08-19 15:37   ` [PATCH 8/8] btrfs: rename total_bytes to avoid confusion David Sterba
2014-08-20  2:54   ` [PATCH 8/8 v2] " Anand Jain
2014-08-20 14:29     ` David Sterba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1407911066-5363-8-git-send-email-anand.jain@oracle.com \
    --to=anand.jain@oracle.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).