summaryrefslogtreecommitdiff
path: root/convert/common.h
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2017-02-01 15:06:04 +0100
committerDavid Sterba <dsterba@suse.com>2017-03-08 13:00:46 +0100
commit52319450e70828181d1dd92f9cca1bc38611038e (patch)
tree30be23d751e96af9d6061145dcc0ba586ca5c480 /convert/common.h
parentd1d99f50e346048ac1c151204b6800d729f48313 (diff)
btrfs-progs: convert: rename members that clash with other functions
Rename 'free' and also 'used' for consistency. Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'convert/common.h')
-rw-r--r--convert/common.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/convert/common.h b/convert/common.h
index 55a65547..0d3adeaa 100644
--- a/convert/common.h
+++ b/convert/common.h
@@ -39,13 +39,13 @@ struct btrfs_convert_context {
const struct btrfs_convert_operations *convert_ops;
/* The accurate used space of old filesystem */
- struct cache_tree used;
+ struct cache_tree used_space;
/* Batched ranges which must be covered by data chunks */
struct cache_tree data_chunks;
/* Free space which is not covered by data_chunks */
- struct cache_tree free;
+ struct cache_tree free_space;
void *fs_data;
};