btrfs: rename total_bytes to avoid confusion
authorAnand Jain <Anand.Jain@oracle.com>
Wed, 20 Aug 2014 02:54:17 +0000 (10:54 +0800)
committerChris Mason <clm@fb.com>
Wed, 17 Sep 2014 20:38:12 +0000 (13:38 -0700)
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>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
fs/btrfs/volumes.c

index 8482396056eeee5d8e3ef96cb08d5b62e8d8ab1a..e9676a42430946aa5f6cec00cf63912140021353 100644 (file)
@@ -2108,7 +2108,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 tmp;
        int seeding_dev = 0;
        int ret = 0;
 
@@ -2211,13 +2211,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);
+       tmp = btrfs_super_total_bytes(root->fs_info->super_copy);
        btrfs_set_super_total_bytes(root->fs_info->super_copy,
-                                   total_bytes + device->total_bytes);
+                                   tmp + device->total_bytes);
 
-       total_bytes = btrfs_super_num_devices(root->fs_info->super_copy);
+       tmp = btrfs_super_num_devices(root->fs_info->super_copy);
        btrfs_set_super_num_devices(root->fs_info->super_copy,
-                                   total_bytes + 1);
+                                   tmp + 1);
 
        /* add sysfs device entry */
        btrfs_kobj_add_device(root->fs_info, device);