aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/volumes.c
diff options
context:
space:
mode:
authorAnand Jain <Anand.Jain@oracle.com>2014-08-19 22:54:17 -0400
committerChris Mason <clm@fb.com>2014-09-17 16:38:12 -0400
commit3c1dbdf54a31f4f049a33214c3096595988786bf (patch)
tree386b61a772325397d42d3a26455e758fccf7b994 /fs/btrfs/volumes.c
parentde4c296f63b43794df453a3fffbb4163ccd1c6af (diff)
btrfs: rename total_bytes to avoid confusion
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>
Diffstat (limited to 'fs/btrfs/volumes.c')
-rw-r--r--fs/btrfs/volumes.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 8482396056ee..e9676a424309 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2108,7 +2108,7 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
2108 struct list_head *devices; 2108 struct list_head *devices;
2109 struct super_block *sb = root->fs_info->sb; 2109 struct super_block *sb = root->fs_info->sb;
2110 struct rcu_string *name; 2110 struct rcu_string *name;
2111 u64 total_bytes; 2111 u64 tmp;
2112 int seeding_dev = 0; 2112 int seeding_dev = 0;
2113 int ret = 0; 2113 int ret = 0;
2114 2114
@@ -2211,13 +2211,13 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
2211 if (!blk_queue_nonrot(bdev_get_queue(bdev))) 2211 if (!blk_queue_nonrot(bdev_get_queue(bdev)))
2212 root->fs_info->fs_devices->rotating = 1; 2212 root->fs_info->fs_devices->rotating = 1;
2213 2213
2214 total_bytes = btrfs_super_total_bytes(root->fs_info->super_copy); 2214 tmp = btrfs_super_total_bytes(root->fs_info->super_copy);
2215 btrfs_set_super_total_bytes(root->fs_info->super_copy, 2215 btrfs_set_super_total_bytes(root->fs_info->super_copy,
2216 total_bytes + device->total_bytes); 2216 tmp + device->total_bytes);
2217 2217
2218 total_bytes = btrfs_super_num_devices(root->fs_info->super_copy); 2218 tmp = btrfs_super_num_devices(root->fs_info->super_copy);
2219 btrfs_set_super_num_devices(root->fs_info->super_copy, 2219 btrfs_set_super_num_devices(root->fs_info->super_copy,
2220 total_bytes + 1); 2220 tmp + 1);
2221 2221
2222 /* add sysfs device entry */ 2222 /* add sysfs device entry */
2223 btrfs_kobj_add_device(root->fs_info, device); 2223 btrfs_kobj_add_device(root->fs_info, device);