* [PATCH 01/67] btrfs-progs: add the stack prefix for block_group_used set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 02/67] btrfs-progs: add the stack prefix for block_group_chunk_objectid " Lu Fengqi
` (66 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The block_group_used set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfs-fragments.c | 2 +-
chunk-recover.c | 4 ++--
cmds-check.c | 2 +-
convert/common.c | 2 +-
ctree.h | 2 +-
extent-tree.c | 20 ++++++++++----------
free-space-cache.c | 2 +-
print-tree.c | 2 +-
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/btrfs-fragments.c b/btrfs-fragments.c
index 46c78d2b..db79f969 100644
--- a/btrfs-fragments.c
+++ b/btrfs-fragments.c
@@ -262,7 +262,7 @@ list_fragments(int fd, u64 flags, char *dir)
bg = (struct btrfs_block_group_item *)
(args.buf + off);
bgflags = btrfs_block_group_flags(bg);
- bgused = btrfs_block_group_used(bg);
+ bgused = btrfs_stack_block_group_used(bg);
printf("found block group %lld len %lld "
"flags %lld\n",
diff --git a/chunk-recover.c b/chunk-recover.c
index 4a6d7141..998b2d8f 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1119,7 +1119,7 @@ static int block_group_free_all_extent(struct btrfs_root *root,
BLOCK_GROUP_DIRTY);
set_extent_dirty(&info->free_space_cache, start, end);
- btrfs_set_block_group_used(&cache->item, 0);
+ btrfs_set_stack_block_group_used(&cache->item, 0);
return 0;
}
@@ -1372,7 +1372,7 @@ static int __insert_block_group(struct btrfs_trans_handle *trans,
struct btrfs_key key;
int ret = 0;
- btrfs_set_block_group_used(&bg_item, used);
+ btrfs_set_stack_block_group_used(&bg_item, used);
btrfs_set_block_group_chunk_objectid(&bg_item, used);
btrfs_set_block_group_flags(&bg_item, chunk_rec->type_flags);
key.objectid = chunk_rec->offset;
diff --git a/cmds-check.c b/cmds-check.c
index 7fc30da8..9acf673f 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -12955,7 +12955,7 @@ static int check_block_group_item(struct btrfs_fs_info *fs_info,
btrfs_item_key_to_cpu(eb, &bg_key, slot);
bi = btrfs_item_ptr(eb, slot, struct btrfs_block_group_item);
read_extent_buffer(eb, &bg_item, (unsigned long)bi, sizeof(bg_item));
- used = btrfs_block_group_used(&bg_item);
+ used = btrfs_stack_block_group_used(&bg_item);
bg_flags = btrfs_block_group_flags(&bg_item);
chunk_key.objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
diff --git a/convert/common.c b/convert/common.c
index 3860f3b9..ca3a4768 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -674,7 +674,7 @@ static void insert_temp_block_group(struct extent_buffer *buf,
btrfs_set_item_size(buf, btrfs_item_nr(*slot), sizeof(bgi));
btrfs_set_block_group_flags(&bgi, flag);
- btrfs_set_block_group_used(&bgi, used);
+ btrfs_set_stack_block_group_used(&bgi, used);
btrfs_set_block_group_chunk_objectid(&bgi,
BTRFS_FIRST_CHUNK_TREE_OBJECTID);
write_extent_buffer(buf, &bgi, btrfs_item_ptr_offset(buf, *slot),
diff --git a/ctree.h b/ctree.h
index ef422ea6..77cab9af 100644
--- a/ctree.h
+++ b/ctree.h
@@ -1558,7 +1558,7 @@ static inline void btrfs_set_stripe_devid_nr(struct extent_buffer *eb,
}
/* struct btrfs_block_group_item */
-BTRFS_SETGET_STACK_FUNCS(block_group_used, struct btrfs_block_group_item,
+BTRFS_SETGET_STACK_FUNCS(stack_block_group_used, struct btrfs_block_group_item,
used, 64);
BTRFS_SETGET_FUNCS(disk_block_group_used, struct btrfs_block_group_item,
used, 64);
diff --git a/extent-tree.c b/extent-tree.c
index 055582c3..f9849f27 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -347,7 +347,7 @@ btrfs_find_block_group(struct btrfs_root *root, struct btrfs_block_group_cache
struct btrfs_block_group_cache *shint;
shint = btrfs_lookup_block_group(info, search_start);
if (shint && !shint->ro && block_group_bits(shint, data)) {
- used = btrfs_block_group_used(&shint->item);
+ used = btrfs_stack_block_group_used(&shint->item);
if (used + shint->pinned <
div_factor(shint->key.offset, factor)) {
return shint;
@@ -355,7 +355,7 @@ btrfs_find_block_group(struct btrfs_root *root, struct btrfs_block_group_cache
}
}
if (hint && !hint->ro && block_group_bits(hint, data)) {
- used = btrfs_block_group_used(&hint->item);
+ used = btrfs_stack_block_group_used(&hint->item);
if (used + hint->pinned <
div_factor(hint->key.offset, factor)) {
return hint;
@@ -383,7 +383,7 @@ again:
cache = (struct btrfs_block_group_cache *)(unsigned long)ptr;
last = cache->key.objectid + cache->key.offset;
- used = btrfs_block_group_used(&cache->item);
+ used = btrfs_stack_block_group_used(&cache->item);
if (!cache->ro && block_group_bits(cache, data)) {
if (full_search)
@@ -1962,7 +1962,7 @@ static int update_block_group(struct btrfs_trans_handle *trans,
set_extent_bits(&info->block_group_cache, start, end,
BLOCK_GROUP_DIRTY);
- old_val = btrfs_block_group_used(&cache->item);
+ old_val = btrfs_stack_block_group_used(&cache->item);
num_bytes = min(total, cache->key.offset - byte_in_group);
if (alloc) {
@@ -1976,7 +1976,7 @@ static int update_block_group(struct btrfs_trans_handle *trans,
bytenr, bytenr + num_bytes - 1);
}
}
- btrfs_set_block_group_used(&cache->item, old_val);
+ btrfs_set_stack_block_group_used(&cache->item, old_val);
total -= num_bytes;
bytenr += num_bytes;
}
@@ -3291,8 +3291,8 @@ int btrfs_read_block_groups(struct btrfs_root *root)
account_super_bytes(info, cache);
ret = update_space_info(info, cache->flags, found_key.offset,
- btrfs_block_group_used(&cache->item),
- &space_info);
+ btrfs_stack_block_group_used(&cache->item),
+ &space_info);
BUG_ON(ret);
cache->space_info = space_info;
@@ -3326,7 +3326,7 @@ btrfs_add_block_group(struct btrfs_fs_info *fs_info, u64 bytes_used, u64 type,
cache->key.offset = size;
cache->key.type = BTRFS_BLOCK_GROUP_ITEM_KEY;
- btrfs_set_block_group_used(&cache->item, bytes_used);
+ btrfs_set_stack_block_group_used(&cache->item, bytes_used);
btrfs_set_block_group_chunk_objectid(&cache->item, chunk_objectid);
cache->flags = type;
btrfs_set_block_group_flags(&cache->item, type);
@@ -3436,7 +3436,7 @@ int btrfs_make_block_groups(struct btrfs_trans_handle *trans,
cache->key.offset = group_size;
cache->key.type = BTRFS_BLOCK_GROUP_ITEM_KEY;
- btrfs_set_block_group_used(&cache->item, 0);
+ btrfs_set_stack_block_group_used(&cache->item, 0);
btrfs_set_block_group_chunk_objectid(&cache->item,
chunk_objectid);
btrfs_set_block_group_flags(&cache->item, group_type);
@@ -3867,7 +3867,7 @@ int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans,
if (!cache)
break;
start = cache->key.objectid + cache->key.offset;
- btrfs_set_block_group_used(&cache->item, 0);
+ btrfs_set_stack_block_group_used(&cache->item, 0);
cache->space_info->bytes_used = 0;
set_extent_bits(&root->fs_info->block_group_cache,
cache->key.objectid,
diff --git a/free-space-cache.c b/free-space-cache.c
index 50356d04..3d961b2b 100644
--- a/free-space-cache.c
+++ b/free-space-cache.c
@@ -437,7 +437,7 @@ int load_free_space_cache(struct btrfs_fs_info *fs_info,
{
struct btrfs_free_space_ctl *ctl = block_group->free_space_ctl;
struct btrfs_path *path;
- u64 used = btrfs_block_group_used(&block_group->item);
+ u64 used = btrfs_stack_block_group_used(&block_group->item);
int ret = 0;
int matched;
diff --git a/print-tree.c b/print-tree.c
index d3fa8621..e8c045fb 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -999,7 +999,7 @@ static void print_block_group_item(struct extent_buffer *eb,
memset(flags_str, 0, sizeof(flags_str));
bg_flags_to_str(btrfs_block_group_flags(&bg_item), flags_str);
printf("\t\tblock group used %llu chunk_objectid %llu flags %s\n",
- (unsigned long long)btrfs_block_group_used(&bg_item),
+ (unsigned long long)btrfs_stack_block_group_used(&bg_item),
(unsigned long long)btrfs_block_group_chunk_objectid(&bg_item),
flags_str);
}
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 02/67] btrfs-progs: add the stack prefix for block_group_chunk_objectid set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
2018-01-11 5:08 ` [PATCH 01/67] btrfs-progs: add the stack prefix for block_group_used set/get function Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 03/67] btrfs-progs: add the stack prefix for block_group_flags " Lu Fengqi
` (65 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The block_group_chunk_objectid set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
chunk-recover.c | 2 +-
convert/common.c | 2 +-
ctree.h | 2 +-
extent-tree.c | 5 +++--
print-tree.c | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/chunk-recover.c b/chunk-recover.c
index 998b2d8f..31de1354 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1373,7 +1373,7 @@ static int __insert_block_group(struct btrfs_trans_handle *trans,
int ret = 0;
btrfs_set_stack_block_group_used(&bg_item, used);
- btrfs_set_block_group_chunk_objectid(&bg_item, used);
+ btrfs_set_stack_block_group_chunk_objectid(&bg_item, used);
btrfs_set_block_group_flags(&bg_item, chunk_rec->type_flags);
key.objectid = chunk_rec->offset;
key.type = BTRFS_BLOCK_GROUP_ITEM_KEY;
diff --git a/convert/common.c b/convert/common.c
index ca3a4768..8dbad917 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -675,7 +675,7 @@ static void insert_temp_block_group(struct extent_buffer *buf,
btrfs_set_block_group_flags(&bgi, flag);
btrfs_set_stack_block_group_used(&bgi, used);
- btrfs_set_block_group_chunk_objectid(&bgi,
+ btrfs_set_stack_block_group_chunk_objectid(&bgi,
BTRFS_FIRST_CHUNK_TREE_OBJECTID);
write_extent_buffer(buf, &bgi, btrfs_item_ptr_offset(buf, *slot),
sizeof(bgi));
diff --git a/ctree.h b/ctree.h
index 77cab9af..71635318 100644
--- a/ctree.h
+++ b/ctree.h
@@ -1562,7 +1562,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_block_group_used, struct btrfs_block_group_item,
used, 64);
BTRFS_SETGET_FUNCS(disk_block_group_used, struct btrfs_block_group_item,
used, 64);
-BTRFS_SETGET_STACK_FUNCS(block_group_chunk_objectid,
+BTRFS_SETGET_STACK_FUNCS(stack_block_group_chunk_objectid,
struct btrfs_block_group_item, chunk_objectid, 64);
BTRFS_SETGET_FUNCS(disk_block_group_chunk_objectid,
diff --git a/extent-tree.c b/extent-tree.c
index f9849f27..033bf53b 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -3327,7 +3327,8 @@ btrfs_add_block_group(struct btrfs_fs_info *fs_info, u64 bytes_used, u64 type,
cache->key.type = BTRFS_BLOCK_GROUP_ITEM_KEY;
btrfs_set_stack_block_group_used(&cache->item, bytes_used);
- btrfs_set_block_group_chunk_objectid(&cache->item, chunk_objectid);
+ btrfs_set_stack_block_group_chunk_objectid(&cache->item,
+ chunk_objectid);
cache->flags = type;
btrfs_set_block_group_flags(&cache->item, type);
@@ -3437,7 +3438,7 @@ int btrfs_make_block_groups(struct btrfs_trans_handle *trans,
cache->key.type = BTRFS_BLOCK_GROUP_ITEM_KEY;
btrfs_set_stack_block_group_used(&cache->item, 0);
- btrfs_set_block_group_chunk_objectid(&cache->item,
+ btrfs_set_stack_block_group_chunk_objectid(&cache->item,
chunk_objectid);
btrfs_set_block_group_flags(&cache->item, group_type);
diff --git a/print-tree.c b/print-tree.c
index e8c045fb..6c5aaea4 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -1000,7 +1000,7 @@ static void print_block_group_item(struct extent_buffer *eb,
bg_flags_to_str(btrfs_block_group_flags(&bg_item), flags_str);
printf("\t\tblock group used %llu chunk_objectid %llu flags %s\n",
(unsigned long long)btrfs_stack_block_group_used(&bg_item),
- (unsigned long long)btrfs_block_group_chunk_objectid(&bg_item),
+ (unsigned long long)btrfs_stack_block_group_chunk_objectid(&bg_item),
flags_str);
}
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 03/67] btrfs-progs: add the stack prefix for block_group_flags set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
2018-01-11 5:08 ` [PATCH 01/67] btrfs-progs: add the stack prefix for block_group_used set/get function Lu Fengqi
2018-01-11 5:08 ` [PATCH 02/67] btrfs-progs: add the stack prefix for block_group_chunk_objectid " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 04/67] btrfs-progs: add the stack prefix for disk_key_objectid " Lu Fengqi
` (64 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The block_group_flags set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfs-fragments.c | 2 +-
chunk-recover.c | 2 +-
cmds-check.c | 6 +++---
convert/common.c | 2 +-
ctree.h | 2 +-
extent-tree.c | 6 +++---
print-tree.c | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/btrfs-fragments.c b/btrfs-fragments.c
index db79f969..91b683de 100644
--- a/btrfs-fragments.c
+++ b/btrfs-fragments.c
@@ -261,7 +261,7 @@ list_fragments(int fd, u64 flags, char *dir)
bg = (struct btrfs_block_group_item *)
(args.buf + off);
- bgflags = btrfs_block_group_flags(bg);
+ bgflags = btrfs_stack_block_group_flags(bg);
bgused = btrfs_stack_block_group_used(bg);
printf("found block group %lld len %lld "
diff --git a/chunk-recover.c b/chunk-recover.c
index 31de1354..cfcf97d4 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1374,7 +1374,7 @@ static int __insert_block_group(struct btrfs_trans_handle *trans,
btrfs_set_stack_block_group_used(&bg_item, used);
btrfs_set_stack_block_group_chunk_objectid(&bg_item, used);
- btrfs_set_block_group_flags(&bg_item, chunk_rec->type_flags);
+ btrfs_set_stack_block_group_flags(&bg_item, chunk_rec->type_flags);
key.objectid = chunk_rec->offset;
key.type = BTRFS_BLOCK_GROUP_ITEM_KEY;
key.offset = chunk_rec->length;
diff --git a/cmds-check.c b/cmds-check.c
index 9acf673f..207a927d 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -12956,7 +12956,7 @@ static int check_block_group_item(struct btrfs_fs_info *fs_info,
bi = btrfs_item_ptr(eb, slot, struct btrfs_block_group_item);
read_extent_buffer(eb, &bg_item, (unsigned long)bi, sizeof(bg_item));
used = btrfs_stack_block_group_used(&bg_item);
- bg_flags = btrfs_block_group_flags(&bg_item);
+ bg_flags = btrfs_stack_block_group_flags(&bg_item);
chunk_key.objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
chunk_key.type = BTRFS_CHUNK_ITEM_KEY;
@@ -13158,11 +13158,11 @@ static int check_chunk_item(struct btrfs_fs_info *fs_info,
struct btrfs_block_group_item);
read_extent_buffer(leaf, &bg_item, (unsigned long)bi,
sizeof(bg_item));
- if (btrfs_block_group_flags(&bg_item) != type) {
+ if (btrfs_stack_block_group_flags(&bg_item) != type) {
error(
"chunk[%llu %llu) related block group item flags mismatch, wanted: %llu, have: %llu",
chunk_key.offset, chunk_end, type,
- btrfs_block_group_flags(&bg_item));
+ btrfs_stack_block_group_flags(&bg_item));
err |= REFERENCER_MISSING;
}
}
diff --git a/convert/common.c b/convert/common.c
index 8dbad917..e288d129 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -673,7 +673,7 @@ static void insert_temp_block_group(struct extent_buffer *buf,
btrfs_set_item_offset(buf, btrfs_item_nr(*slot), *itemoff);
btrfs_set_item_size(buf, btrfs_item_nr(*slot), sizeof(bgi));
- btrfs_set_block_group_flags(&bgi, flag);
+ btrfs_set_stack_block_group_flags(&bgi, flag);
btrfs_set_stack_block_group_used(&bgi, used);
btrfs_set_stack_block_group_chunk_objectid(&bgi,
BTRFS_FIRST_CHUNK_TREE_OBJECTID);
diff --git a/ctree.h b/ctree.h
index 71635318..d4254b67 100644
--- a/ctree.h
+++ b/ctree.h
@@ -1569,7 +1569,7 @@ BTRFS_SETGET_FUNCS(disk_block_group_chunk_objectid,
struct btrfs_block_group_item, chunk_objectid, 64);
BTRFS_SETGET_FUNCS(disk_block_group_flags,
struct btrfs_block_group_item, flags, 64);
-BTRFS_SETGET_STACK_FUNCS(block_group_flags,
+BTRFS_SETGET_STACK_FUNCS(stack_block_group_flags,
struct btrfs_block_group_item, flags, 64);
/* struct btrfs_free_space_info */
diff --git a/extent-tree.c b/extent-tree.c
index 033bf53b..9ca0339e 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -3275,7 +3275,7 @@ int btrfs_read_block_groups(struct btrfs_root *root)
continue;
}
- cache->flags = btrfs_block_group_flags(&cache->item);
+ cache->flags = btrfs_stack_block_group_flags(&cache->item);
bit = 0;
if (cache->flags & BTRFS_BLOCK_GROUP_DATA) {
bit = BLOCK_GROUP_DATA;
@@ -3330,7 +3330,7 @@ btrfs_add_block_group(struct btrfs_fs_info *fs_info, u64 bytes_used, u64 type,
btrfs_set_stack_block_group_chunk_objectid(&cache->item,
chunk_objectid);
cache->flags = type;
- btrfs_set_block_group_flags(&cache->item, type);
+ btrfs_set_stack_block_group_flags(&cache->item, type);
account_super_bytes(fs_info, cache);
ret = update_space_info(fs_info, cache->flags, size, bytes_used,
@@ -3440,7 +3440,7 @@ int btrfs_make_block_groups(struct btrfs_trans_handle *trans,
btrfs_set_stack_block_group_used(&cache->item, 0);
btrfs_set_stack_block_group_chunk_objectid(&cache->item,
chunk_objectid);
- btrfs_set_block_group_flags(&cache->item, group_type);
+ btrfs_set_stack_block_group_flags(&cache->item, group_type);
cache->flags = group_type;
diff --git a/print-tree.c b/print-tree.c
index 6c5aaea4..96cca9d5 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -997,7 +997,7 @@ static void print_block_group_item(struct extent_buffer *eb,
read_extent_buffer(eb, &bg_item, (unsigned long)bgi, sizeof(bg_item));
memset(flags_str, 0, sizeof(flags_str));
- bg_flags_to_str(btrfs_block_group_flags(&bg_item), flags_str);
+ bg_flags_to_str(btrfs_stack_block_group_flags(&bg_item), flags_str);
printf("\t\tblock group used %llu chunk_objectid %llu flags %s\n",
(unsigned long long)btrfs_stack_block_group_used(&bg_item),
(unsigned long long)btrfs_stack_block_group_chunk_objectid(&bg_item),
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 04/67] btrfs-progs: add the stack prefix for disk_key_objectid set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (2 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 03/67] btrfs-progs: add the stack prefix for block_group_flags " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 05/67] btrfs-progs: add the stack prefix for disk_key_offset " Lu Fengqi
` (63 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The disk_key_objectid set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfs-list.c | 2 +-
chunk-recover.c | 2 +-
cmds-check.c | 14 ++++++++------
convert/common.c | 15 ++++++++-------
ctree.c | 3 ++-
ctree.h | 2 +-
dir-test.c | 4 ++--
free-space-cache.c | 2 +-
image/main.c | 2 +-
mkfs/common.c | 13 +++++++------
print-tree.c | 4 ++--
random-test.c | 4 ++--
12 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/btrfs-list.c b/btrfs-list.c
index b6d76585..ffd143c0 100644
--- a/btrfs-list.c
+++ b/btrfs-list.c
@@ -951,7 +951,7 @@ int btrfs_list_get_default_subvolume(int fd, u64 *default_id)
name = (char *)(di + 1);
if (!strncmp("default", name, name_len))
- found = btrfs_disk_key_objectid(&di->location);
+ found = btrfs_stack_disk_key_objectid(&di->location);
}
out:
diff --git a/chunk-recover.c b/chunk-recover.c
index cfcf97d4..0448e5e9 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1160,7 +1160,7 @@ static int __rebuild_chunk_root(struct btrfs_trans_handle *trans,
if (min_devid > dev->devid)
min_devid = dev->devid;
}
- btrfs_set_disk_key_objectid(&disk_key, BTRFS_DEV_ITEMS_OBJECTID);
+ btrfs_set_stack_disk_key_objectid(&disk_key, BTRFS_DEV_ITEMS_OBJECTID);
btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_ITEM_KEY);
btrfs_set_disk_key_offset(&disk_key, min_devid);
diff --git a/cmds-check.c b/cmds-check.c
index 207a927d..a39e651a 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -2622,7 +2622,8 @@ static int repair_tree_block_ref(struct btrfs_trans_handle *trans,
bi = (struct btrfs_tree_block_info *)(ei + 1);
memset_extent_buffer(eb, 0, (unsigned long)bi,
sizeof(*bi));
- btrfs_set_disk_key_objectid(©_key, root->objectid);
+ btrfs_set_stack_disk_key_objectid(©_key,
+ root->objectid);
btrfs_set_disk_key_type(©_key, 0);
btrfs_set_disk_key_offset(©_key, 0);
@@ -4489,7 +4490,7 @@ static int check_fs_root(struct btrfs_root *root,
return -EIO;
if (btrfs_root_refs(root_item) > 0 ||
- btrfs_disk_key_objectid(&root_item->drop_progress) == 0) {
+ btrfs_stack_disk_key_objectid(&root_item->drop_progress) == 0) {
path.nodes[level] = root->node;
extent_buffer_get(root->node);
path.slots[level] = 0;
@@ -6442,7 +6443,7 @@ static int check_fs_first_inode(struct btrfs_root *root, unsigned int ext_ref)
/* For root being dropped, we don't need to check first inode */
if (btrfs_root_refs(&root->root_item) == 0 &&
- btrfs_disk_key_objectid(&root->root_item.drop_progress) >=
+ btrfs_stack_disk_key_objectid(&root->root_item.drop_progress) >=
BTRFS_FIRST_FREE_OBJECTID)
return 0;
@@ -6588,7 +6589,7 @@ static int check_btrfs_root(struct btrfs_trans_handle *trans,
btrfs_init_path(&path);
if (btrfs_root_refs(root_item) > 0 ||
- btrfs_disk_key_objectid(&root_item->drop_progress) == 0) {
+ btrfs_stack_disk_key_objectid(&root_item->drop_progress) == 0) {
path.nodes[level] = root->node;
path.slots[level] = 0;
extent_buffer_get(root->node);
@@ -9727,7 +9728,7 @@ static int record_extent(struct btrfs_trans_handle *trans,
memset_extent_buffer(leaf, 0, (unsigned long)bi,
sizeof(*bi));
- btrfs_set_disk_key_objectid(©_key,
+ btrfs_set_stack_disk_key_objectid(©_key,
rec->info_objectid);
btrfs_set_disk_key_type(©_key, 0);
btrfs_set_disk_key_offset(©_key, 0);
@@ -11538,7 +11539,8 @@ again:
offset = btrfs_item_ptr_offset(leaf, path.slots[0]);
read_extent_buffer(leaf, &ri, offset, sizeof(ri));
last_snapshot = btrfs_root_last_snapshot(&ri);
- if (btrfs_disk_key_objectid(&ri.drop_progress) == 0) {
+ if (btrfs_stack_disk_key_objectid(&ri.drop_progress)
+ == 0) {
level = btrfs_root_level(&ri);
ret = add_root_item_to_list(&normal_trees,
found_key.objectid,
diff --git a/convert/common.c b/convert/common.c
index e288d129..d18a5179 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -199,7 +199,7 @@ static void insert_temp_root_item(struct extent_buffer *buf,
memset(&disk_key, 0, sizeof(disk_key));
btrfs_set_disk_key_type(&disk_key, BTRFS_ROOT_ITEM_KEY);
- btrfs_set_disk_key_objectid(&disk_key, objectid);
+ btrfs_set_stack_disk_key_objectid(&disk_key, objectid);
btrfs_set_disk_key_offset(&disk_key, 0);
btrfs_set_item_key(buf, &disk_key, *slot);
@@ -306,7 +306,7 @@ static int insert_temp_dev_item(int fd, struct extent_buffer *buf,
(*itemoff) -= sizeof(*dev_item);
/* setup device item 1, 0 is for replace case */
btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_ITEM_KEY);
- btrfs_set_disk_key_objectid(&disk_key, BTRFS_DEV_ITEMS_OBJECTID);
+ btrfs_set_stack_disk_key_objectid(&disk_key, BTRFS_DEV_ITEMS_OBJECTID);
btrfs_set_disk_key_offset(&disk_key, 1);
btrfs_set_item_key(buf, &disk_key, *slot);
btrfs_set_item_offset(buf, btrfs_item_nr(*slot), *itemoff);
@@ -366,7 +366,8 @@ static int insert_temp_chunk_item(int fd, struct extent_buffer *buf,
btrfs_set_header_nritems(buf, *slot + 1);
(*itemoff) -= btrfs_chunk_item_size(1);
btrfs_set_disk_key_type(&disk_key, BTRFS_CHUNK_ITEM_KEY);
- btrfs_set_disk_key_objectid(&disk_key, BTRFS_FIRST_CHUNK_TREE_OBJECTID);
+ btrfs_set_stack_disk_key_objectid(&disk_key,
+ BTRFS_FIRST_CHUNK_TREE_OBJECTID);
btrfs_set_disk_key_offset(&disk_key, start);
btrfs_set_item_key(buf, &disk_key, *slot);
btrfs_set_item_offset(buf, btrfs_item_nr(*slot), *itemoff);
@@ -469,7 +470,7 @@ static void insert_temp_dev_extent(struct extent_buffer *buf,
btrfs_set_header_nritems(buf, *slot + 1);
(*itemoff) -= sizeof(*dev_extent);
btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_EXTENT_KEY);
- btrfs_set_disk_key_objectid(&disk_key, 1);
+ btrfs_set_stack_disk_key_objectid(&disk_key, 1);
btrfs_set_disk_key_offset(&disk_key, start);
btrfs_set_item_key(buf, &disk_key, *slot);
btrfs_set_item_offset(buf, btrfs_item_nr(*slot), *itemoff);
@@ -601,7 +602,7 @@ static int insert_temp_extent_item(int fd, struct extent_buffer *buf,
btrfs_set_disk_key_type(&disk_key, BTRFS_EXTENT_ITEM_KEY);
btrfs_set_disk_key_offset(&disk_key, cfg->nodesize);
}
- btrfs_set_disk_key_objectid(&disk_key, bytenr);
+ btrfs_set_stack_disk_key_objectid(&disk_key, bytenr);
btrfs_set_item_key(buf, &disk_key, *slot);
btrfs_set_item_offset(buf, btrfs_item_nr(*slot), *itemoff);
@@ -644,7 +645,7 @@ static int insert_temp_extent_item(int fd, struct extent_buffer *buf,
}
if (btrfs_header_nritems(tmp) == 0) {
btrfs_set_disk_key_type(&tree_info_key, 0);
- btrfs_set_disk_key_objectid(&tree_info_key, 0);
+ btrfs_set_stack_disk_key_objectid(&tree_info_key, 0);
btrfs_set_disk_key_offset(&tree_info_key, 0);
} else {
btrfs_item_key(tmp, &tree_info_key, 0);
@@ -667,7 +668,7 @@ static void insert_temp_block_group(struct extent_buffer *buf,
btrfs_set_header_nritems(buf, *slot + 1);
(*itemoff) -= sizeof(bgi);
btrfs_set_disk_key_type(&disk_key, BTRFS_BLOCK_GROUP_ITEM_KEY);
- btrfs_set_disk_key_objectid(&disk_key, bytenr);
+ btrfs_set_stack_disk_key_objectid(&disk_key, bytenr);
btrfs_set_disk_key_offset(&disk_key, len);
btrfs_set_item_key(buf, &disk_key, *slot);
btrfs_set_item_offset(buf, btrfs_item_nr(*slot), *itemoff);
diff --git a/ctree.c b/ctree.c
index 4fc33b14..4d8b0e05 100644
--- a/ctree.c
+++ b/ctree.c
@@ -1011,7 +1011,8 @@ void reada_for_search(struct btrfs_root *root, struct btrfs_path *path,
}
if (path->reada < 0 && objectid) {
btrfs_node_key(node, &disk_key, nr);
- if (btrfs_disk_key_objectid(&disk_key) != objectid)
+ if (btrfs_stack_disk_key_objectid(&disk_key)
+ != objectid)
break;
}
search = btrfs_node_blockptr(node, nr);
diff --git a/ctree.h b/ctree.h
index d4254b67..59f56599 100644
--- a/ctree.h
+++ b/ctree.h
@@ -1927,7 +1927,7 @@ static inline void btrfs_set_free_space_key(struct extent_buffer *eb,
}
/* struct btrfs_disk_key */
-BTRFS_SETGET_STACK_FUNCS(disk_key_objectid, struct btrfs_disk_key,
+BTRFS_SETGET_STACK_FUNCS(stack_disk_key_objectid, struct btrfs_disk_key,
objectid, 64);
BTRFS_SETGET_STACK_FUNCS(disk_key_offset, struct btrfs_disk_key, offset, 64);
BTRFS_SETGET_STACK_FUNCS(disk_key_type, struct btrfs_disk_key, type, 8);
diff --git a/dir-test.c b/dir-test.c
index cfb77f2a..8fb23b82 100644
--- a/dir-test.c
+++ b/dir-test.c
@@ -183,7 +183,7 @@ static int del_dir_item(struct btrfs_trans_handle *trans,
/* find the inode number of the file */
di = btrfs_item_ptr(&path->nodes[0]->leaf, path->slots[0],
struct btrfs_dir_item);
- file_objectid = btrfs_disk_key_objectid(&di->location);
+ file_objectid = btrfs_stack_disk_key_objectid(&di->location);
/* delete the directory item */
ret = btrfs_del_item(trans, root, path);
@@ -264,7 +264,7 @@ static int lookup_item(struct btrfs_trans_handle *trans, struct btrfs_root
if (!ret) {
di = btrfs_item_ptr(&path.nodes[0]->leaf, path.slots[0],
struct btrfs_dir_item);
- objectid = btrfs_disk_key_objectid(&di->location);
+ objectid = btrfs_stack_disk_key_objectid(&di->location);
}
btrfs_release_path(&path);
if (ret) {
diff --git a/free-space-cache.c b/free-space-cache.c
index 3d961b2b..c432435f 100644
--- a/free-space-cache.c
+++ b/free-space-cache.c
@@ -918,7 +918,7 @@ int btrfs_clear_free_space_cache(struct btrfs_fs_info *fs_info,
slot = path.slots[0];
sc_header = btrfs_item_ptr(node, slot, struct btrfs_free_space_header);
btrfs_free_space_key(node, sc_header, &location);
- ino = btrfs_disk_key_objectid(&location);
+ ino = btrfs_stack_disk_key_objectid(&location);
/* Delete the free space header, as we have the ino to continue */
ret = btrfs_del_item(trans, tree_root, &path);
diff --git a/image/main.c b/image/main.c
index 54a2d7d5..69897b91 100644
--- a/image/main.c
+++ b/image/main.c
@@ -1100,7 +1100,7 @@ static void update_super_old(u8 *buffer)
chunk = (struct btrfs_chunk *)(super->sys_chunk_array +
sizeof(struct btrfs_disk_key));
- btrfs_set_disk_key_objectid(key, BTRFS_FIRST_CHUNK_TREE_OBJECTID);
+ btrfs_set_stack_disk_key_objectid(key, BTRFS_FIRST_CHUNK_TREE_OBJECTID);
btrfs_set_disk_key_type(key, BTRFS_CHUNK_ITEM_KEY);
btrfs_set_disk_key_offset(key, 0);
diff --git a/mkfs/common.c b/mkfs/common.c
index dd5e7ecf..2697437a 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -71,7 +71,7 @@ static int btrfs_create_tree_root(int fd, struct btrfs_mkfs_config *cfg,
continue;
btrfs_set_root_bytenr(&root_item, cfg->blocks[blk]);
- btrfs_set_disk_key_objectid(&disk_key,
+ btrfs_set_stack_disk_key_objectid(&disk_key,
reference_root_table[blk]);
btrfs_set_item_key(buf, &disk_key, nritems);
btrfs_set_item_offset(buf, btrfs_item_nr(nritems), itemoff);
@@ -224,7 +224,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
/* create extent item */
itemoff -= item_size;
- btrfs_set_disk_key_objectid(&disk_key, cfg->blocks[i]);
+ btrfs_set_stack_disk_key_objectid(&disk_key, cfg->blocks[i]);
if (skinny_metadata) {
btrfs_set_disk_key_type(&disk_key,
BTRFS_METADATA_ITEM_KEY);
@@ -249,7 +249,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
/* create extent ref */
ref_root = reference_root_table[i];
- btrfs_set_disk_key_objectid(&disk_key, cfg->blocks[i]);
+ btrfs_set_stack_disk_key_objectid(&disk_key, cfg->blocks[i]);
btrfs_set_disk_key_offset(&disk_key, ref_root);
btrfs_set_disk_key_type(&disk_key, BTRFS_TREE_BLOCK_REF_KEY);
btrfs_set_item_key(buf, &disk_key, nritems);
@@ -276,7 +276,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
itemoff = __BTRFS_LEAF_DATA_SIZE(cfg->nodesize) - item_size;
/* first device 1 (there is no device 0) */
- btrfs_set_disk_key_objectid(&disk_key, BTRFS_DEV_ITEMS_OBJECTID);
+ btrfs_set_stack_disk_key_objectid(&disk_key, BTRFS_DEV_ITEMS_OBJECTID);
btrfs_set_disk_key_offset(&disk_key, 1);
btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_ITEM_KEY);
btrfs_set_item_key(buf, &disk_key, nritems);
@@ -308,7 +308,8 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
itemoff = itemoff - item_size;
/* then we have chunk 0 */
- btrfs_set_disk_key_objectid(&disk_key, BTRFS_FIRST_CHUNK_TREE_OBJECTID);
+ btrfs_set_stack_disk_key_objectid(&disk_key,
+ BTRFS_FIRST_CHUNK_TREE_OBJECTID);
btrfs_set_disk_key_offset(&disk_key, 0);
btrfs_set_disk_key_type(&disk_key, BTRFS_CHUNK_ITEM_KEY);
btrfs_set_item_key(buf, &disk_key, nritems);
@@ -362,7 +363,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
itemoff = __BTRFS_LEAF_DATA_SIZE(cfg->nodesize) -
sizeof(struct btrfs_dev_extent);
- btrfs_set_disk_key_objectid(&disk_key, 1);
+ btrfs_set_stack_disk_key_objectid(&disk_key, 1);
btrfs_set_disk_key_offset(&disk_key, 0);
btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_EXTENT_KEY);
btrfs_set_item_key(buf, &disk_key, nritems);
diff --git a/print-tree.c b/print-tree.c
index 96cca9d5..254982bc 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -807,7 +807,7 @@ void print_objectid(FILE *stream, u64 objectid, u8 type)
void btrfs_print_key(struct btrfs_disk_key *disk_key)
{
- u64 objectid = btrfs_disk_key_objectid(disk_key);
+ u64 objectid = btrfs_stack_disk_key_objectid(disk_key);
u8 type = btrfs_disk_key_type(disk_key);
u64 offset = btrfs_disk_key_offset(disk_key);
@@ -1202,7 +1202,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *eb)
ptr = btrfs_item_ptr(eb, i, void*);
btrfs_item_key(eb, &disk_key, i);
- objectid = btrfs_disk_key_objectid(&disk_key);
+ objectid = btrfs_stack_disk_key_objectid(&disk_key);
type = btrfs_disk_key_type(&disk_key);
offset = btrfs_disk_key_offset(&disk_key);
diff --git a/random-test.c b/random-test.c
index d5f830a9..1c3ec4c7 100644
--- a/random-test.c
+++ b/random-test.c
@@ -201,7 +201,7 @@ static int empty_tree(struct btrfs_trans_handle *trans, struct btrfs_root
path.slots[0] -= 1;
}
slot = path.slots[0];
- found = btrfs_disk_key_objectid(
+ found = btrfs_stack_disk_key_objectid(
&path.nodes[0]->leaf.items[slot].key);
ret = btrfs_del_item(trans, root, &path);
count++;
@@ -306,7 +306,7 @@ static int fill_radix(struct btrfs_root *root, struct radix_tree_root *radix)
slot -= 1;
}
for (i = slot; i >= 0; i--) {
- found = btrfs_disk_key_objectid(&path.nodes[0]->
+ found = btrfs_stack_disk_key_objectid(&path.nodes[0]->
leaf.items[i].key);
radix_tree_preload(GFP_KERNEL);
ret = radix_tree_insert(radix, found, (void *)found);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 05/67] btrfs-progs: add the stack prefix for disk_key_offset set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (3 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 04/67] btrfs-progs: add the stack prefix for disk_key_objectid " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 06/67] btrfs-progs: add the stack prefix for disk_key_type " Lu Fengqi
` (62 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The disk_key_offset set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
chunk-recover.c | 2 +-
cmds-check.c | 4 ++--
convert/common.c | 16 ++++++++--------
ctree.c | 4 ++--
ctree.h | 3 ++-
image/main.c | 2 +-
mkfs/common.c | 15 ++++++++-------
print-tree.c | 4 ++--
qgroup-verify.c | 2 +-
9 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/chunk-recover.c b/chunk-recover.c
index 0448e5e9..89c0eea6 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1162,7 +1162,7 @@ static int __rebuild_chunk_root(struct btrfs_trans_handle *trans,
}
btrfs_set_stack_disk_key_objectid(&disk_key, BTRFS_DEV_ITEMS_OBJECTID);
btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_ITEM_KEY);
- btrfs_set_disk_key_offset(&disk_key, min_devid);
+ btrfs_set_stack_disk_key_offset(&disk_key, min_devid);
cow = btrfs_alloc_free_block(trans, root, root->fs_info->nodesize,
BTRFS_CHUNK_TREE_OBJECTID,
diff --git a/cmds-check.c b/cmds-check.c
index a39e651a..68ba3448 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -2625,7 +2625,7 @@ static int repair_tree_block_ref(struct btrfs_trans_handle *trans,
btrfs_set_stack_disk_key_objectid(©_key,
root->objectid);
btrfs_set_disk_key_type(©_key, 0);
- btrfs_set_disk_key_offset(©_key, 0);
+ btrfs_set_stack_disk_key_offset(©_key, 0);
btrfs_set_tree_block_level(eb, bi, level);
btrfs_set_tree_block_key(eb, bi, ©_key);
@@ -9731,7 +9731,7 @@ static int record_extent(struct btrfs_trans_handle *trans,
btrfs_set_stack_disk_key_objectid(©_key,
rec->info_objectid);
btrfs_set_disk_key_type(©_key, 0);
- btrfs_set_disk_key_offset(©_key, 0);
+ btrfs_set_stack_disk_key_offset(©_key, 0);
btrfs_set_tree_block_level(leaf, bi, rec->info_level);
btrfs_set_tree_block_key(leaf, bi, ©_key);
diff --git a/convert/common.c b/convert/common.c
index d18a5179..6b5f98dd 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -200,7 +200,7 @@ static void insert_temp_root_item(struct extent_buffer *buf,
memset(&disk_key, 0, sizeof(disk_key));
btrfs_set_disk_key_type(&disk_key, BTRFS_ROOT_ITEM_KEY);
btrfs_set_stack_disk_key_objectid(&disk_key, objectid);
- btrfs_set_disk_key_offset(&disk_key, 0);
+ btrfs_set_stack_disk_key_offset(&disk_key, 0);
btrfs_set_item_key(buf, &disk_key, *slot);
btrfs_set_item_offset(buf, btrfs_item_nr(*slot), *itemoff);
@@ -307,7 +307,7 @@ static int insert_temp_dev_item(int fd, struct extent_buffer *buf,
/* setup device item 1, 0 is for replace case */
btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_ITEM_KEY);
btrfs_set_stack_disk_key_objectid(&disk_key, BTRFS_DEV_ITEMS_OBJECTID);
- btrfs_set_disk_key_offset(&disk_key, 1);
+ btrfs_set_stack_disk_key_offset(&disk_key, 1);
btrfs_set_item_key(buf, &disk_key, *slot);
btrfs_set_item_offset(buf, btrfs_item_nr(*slot), *itemoff);
btrfs_set_item_size(buf, btrfs_item_nr(*slot), sizeof(*dev_item));
@@ -368,7 +368,7 @@ static int insert_temp_chunk_item(int fd, struct extent_buffer *buf,
btrfs_set_disk_key_type(&disk_key, BTRFS_CHUNK_ITEM_KEY);
btrfs_set_stack_disk_key_objectid(&disk_key,
BTRFS_FIRST_CHUNK_TREE_OBJECTID);
- btrfs_set_disk_key_offset(&disk_key, start);
+ btrfs_set_stack_disk_key_offset(&disk_key, start);
btrfs_set_item_key(buf, &disk_key, *slot);
btrfs_set_item_offset(buf, btrfs_item_nr(*slot), *itemoff);
btrfs_set_item_size(buf, btrfs_item_nr(*slot),
@@ -471,7 +471,7 @@ static void insert_temp_dev_extent(struct extent_buffer *buf,
(*itemoff) -= sizeof(*dev_extent);
btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_EXTENT_KEY);
btrfs_set_stack_disk_key_objectid(&disk_key, 1);
- btrfs_set_disk_key_offset(&disk_key, start);
+ btrfs_set_stack_disk_key_offset(&disk_key, start);
btrfs_set_item_key(buf, &disk_key, *slot);
btrfs_set_item_offset(buf, btrfs_item_nr(*slot), *itemoff);
btrfs_set_item_size(buf, btrfs_item_nr(*slot), sizeof(*dev_extent));
@@ -597,10 +597,10 @@ static int insert_temp_extent_item(int fd, struct extent_buffer *buf,
if (skinny_metadata) {
btrfs_set_disk_key_type(&disk_key, BTRFS_METADATA_ITEM_KEY);
- btrfs_set_disk_key_offset(&disk_key, 0);
+ btrfs_set_stack_disk_key_offset(&disk_key, 0);
} else {
btrfs_set_disk_key_type(&disk_key, BTRFS_EXTENT_ITEM_KEY);
- btrfs_set_disk_key_offset(&disk_key, cfg->nodesize);
+ btrfs_set_stack_disk_key_offset(&disk_key, cfg->nodesize);
}
btrfs_set_stack_disk_key_objectid(&disk_key, bytenr);
@@ -646,7 +646,7 @@ static int insert_temp_extent_item(int fd, struct extent_buffer *buf,
if (btrfs_header_nritems(tmp) == 0) {
btrfs_set_disk_key_type(&tree_info_key, 0);
btrfs_set_stack_disk_key_objectid(&tree_info_key, 0);
- btrfs_set_disk_key_offset(&tree_info_key, 0);
+ btrfs_set_stack_disk_key_offset(&tree_info_key, 0);
} else {
btrfs_item_key(tmp, &tree_info_key, 0);
}
@@ -669,7 +669,7 @@ static void insert_temp_block_group(struct extent_buffer *buf,
(*itemoff) -= sizeof(bgi);
btrfs_set_disk_key_type(&disk_key, BTRFS_BLOCK_GROUP_ITEM_KEY);
btrfs_set_stack_disk_key_objectid(&disk_key, bytenr);
- btrfs_set_disk_key_offset(&disk_key, len);
+ btrfs_set_stack_disk_key_offset(&disk_key, len);
btrfs_set_item_key(buf, &disk_key, *slot);
btrfs_set_item_offset(buf, btrfs_item_nr(*slot), *itemoff);
btrfs_set_item_size(buf, btrfs_item_nr(*slot), sizeof(bgi));
diff --git a/ctree.c b/ctree.c
index 4d8b0e05..818bdfda 100644
--- a/ctree.c
+++ b/ctree.c
@@ -2372,8 +2372,8 @@ int btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path,
data_end + size_diff, btrfs_leaf_data(leaf) +
data_end, old_data_start - data_end);
- offset = btrfs_disk_key_offset(&disk_key);
- btrfs_set_disk_key_offset(&disk_key, offset + size_diff);
+ offset = btrfs_stack_disk_key_offset(&disk_key);
+ btrfs_set_stack_disk_key_offset(&disk_key, offset + size_diff);
btrfs_set_item_key(leaf, &disk_key, slot);
if (slot == 0)
btrfs_fixup_low_keys(root, path, &disk_key, 1);
diff --git a/ctree.h b/ctree.h
index 59f56599..3a1ddd59 100644
--- a/ctree.h
+++ b/ctree.h
@@ -1929,7 +1929,8 @@ static inline void btrfs_set_free_space_key(struct extent_buffer *eb,
/* struct btrfs_disk_key */
BTRFS_SETGET_STACK_FUNCS(stack_disk_key_objectid, struct btrfs_disk_key,
objectid, 64);
-BTRFS_SETGET_STACK_FUNCS(disk_key_offset, struct btrfs_disk_key, offset, 64);
+BTRFS_SETGET_STACK_FUNCS(stack_disk_key_offset, struct btrfs_disk_key, offset,
+ 64);
BTRFS_SETGET_STACK_FUNCS(disk_key_type, struct btrfs_disk_key, type, 8);
static inline void btrfs_disk_key_to_cpu(struct btrfs_key *cpu,
diff --git a/image/main.c b/image/main.c
index 69897b91..7060ebda 100644
--- a/image/main.c
+++ b/image/main.c
@@ -1102,7 +1102,7 @@ static void update_super_old(u8 *buffer)
btrfs_set_stack_disk_key_objectid(key, BTRFS_FIRST_CHUNK_TREE_OBJECTID);
btrfs_set_disk_key_type(key, BTRFS_CHUNK_ITEM_KEY);
- btrfs_set_disk_key_offset(key, 0);
+ btrfs_set_stack_disk_key_offset(key, 0);
btrfs_set_stack_chunk_length(chunk, (u64)-1);
btrfs_set_stack_chunk_owner(chunk, BTRFS_EXTENT_TREE_OBJECTID);
diff --git a/mkfs/common.c b/mkfs/common.c
index 2697437a..f4655b63 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -62,7 +62,7 @@ static int btrfs_create_tree_root(int fd, struct btrfs_mkfs_config *cfg,
btrfs_set_root_generation(&root_item, 1);
btrfs_set_disk_key_type(&disk_key, BTRFS_ROOT_ITEM_KEY);
- btrfs_set_disk_key_offset(&disk_key, 0);
+ btrfs_set_stack_disk_key_offset(&disk_key, 0);
itemoff = __BTRFS_LEAF_DATA_SIZE(cfg->nodesize) - sizeof(root_item);
for (blk = 0; blk < MKFS_BLOCK_COUNT; blk++) {
@@ -228,11 +228,12 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
if (skinny_metadata) {
btrfs_set_disk_key_type(&disk_key,
BTRFS_METADATA_ITEM_KEY);
- btrfs_set_disk_key_offset(&disk_key, 0);
+ btrfs_set_stack_disk_key_offset(&disk_key, 0);
} else {
btrfs_set_disk_key_type(&disk_key,
BTRFS_EXTENT_ITEM_KEY);
- btrfs_set_disk_key_offset(&disk_key, cfg->nodesize);
+ btrfs_set_stack_disk_key_offset(&disk_key,
+ cfg->nodesize);
}
btrfs_set_item_key(buf, &disk_key, nritems);
btrfs_set_item_offset(buf, btrfs_item_nr(nritems),
@@ -250,7 +251,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
/* create extent ref */
ref_root = reference_root_table[i];
btrfs_set_stack_disk_key_objectid(&disk_key, cfg->blocks[i]);
- btrfs_set_disk_key_offset(&disk_key, ref_root);
+ btrfs_set_stack_disk_key_offset(&disk_key, ref_root);
btrfs_set_disk_key_type(&disk_key, BTRFS_TREE_BLOCK_REF_KEY);
btrfs_set_item_key(buf, &disk_key, nritems);
btrfs_set_item_offset(buf, btrfs_item_nr(nritems),
@@ -277,7 +278,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
/* first device 1 (there is no device 0) */
btrfs_set_stack_disk_key_objectid(&disk_key, BTRFS_DEV_ITEMS_OBJECTID);
- btrfs_set_disk_key_offset(&disk_key, 1);
+ btrfs_set_stack_disk_key_offset(&disk_key, 1);
btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_ITEM_KEY);
btrfs_set_item_key(buf, &disk_key, nritems);
btrfs_set_item_offset(buf, btrfs_item_nr(nritems), itemoff);
@@ -310,7 +311,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
/* then we have chunk 0 */
btrfs_set_stack_disk_key_objectid(&disk_key,
BTRFS_FIRST_CHUNK_TREE_OBJECTID);
- btrfs_set_disk_key_offset(&disk_key, 0);
+ btrfs_set_stack_disk_key_offset(&disk_key, 0);
btrfs_set_disk_key_type(&disk_key, BTRFS_CHUNK_ITEM_KEY);
btrfs_set_item_key(buf, &disk_key, nritems);
btrfs_set_item_offset(buf, btrfs_item_nr(nritems), itemoff);
@@ -364,7 +365,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
sizeof(struct btrfs_dev_extent);
btrfs_set_stack_disk_key_objectid(&disk_key, 1);
- btrfs_set_disk_key_offset(&disk_key, 0);
+ btrfs_set_stack_disk_key_offset(&disk_key, 0);
btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_EXTENT_KEY);
btrfs_set_item_key(buf, &disk_key, nritems);
btrfs_set_item_offset(buf, btrfs_item_nr(nritems), itemoff);
diff --git a/print-tree.c b/print-tree.c
index 254982bc..6e7ccfeb 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -809,7 +809,7 @@ void btrfs_print_key(struct btrfs_disk_key *disk_key)
{
u64 objectid = btrfs_stack_disk_key_objectid(disk_key);
u8 type = btrfs_disk_key_type(disk_key);
- u64 offset = btrfs_disk_key_offset(disk_key);
+ u64 offset = btrfs_stack_disk_key_offset(disk_key);
printf("key (");
print_objectid(stdout, objectid, type);
@@ -1204,7 +1204,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *eb)
btrfs_item_key(eb, &disk_key, i);
objectid = btrfs_stack_disk_key_objectid(&disk_key);
type = btrfs_disk_key_type(&disk_key);
- offset = btrfs_disk_key_offset(&disk_key);
+ offset = btrfs_stack_disk_key_offset(&disk_key);
printf("\titem %d ", i);
btrfs_print_key(&disk_key);
diff --git a/qgroup-verify.c b/qgroup-verify.c
index 571b4d4f..5b21bdc7 100644
--- a/qgroup-verify.c
+++ b/qgroup-verify.c
@@ -851,7 +851,7 @@ static struct qgroup_count *alloc_count(struct btrfs_disk_key *key,
struct qgroup_info *item;
if (c) {
- c->qgroupid = btrfs_disk_key_offset(key);
+ c->qgroupid = btrfs_stack_disk_key_offset(key);
c->key = *key;
item = &c->diskinfo;
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 06/67] btrfs-progs: add the stack prefix for disk_key_type set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (4 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 05/67] btrfs-progs: add the stack prefix for disk_key_offset " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 07/67] btrfs-progs: add the stack prefix for root_generation " Lu Fengqi
` (61 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The disk_key_type set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
chunk-recover.c | 2 +-
cmds-check.c | 4 ++--
convert/common.c | 17 +++++++++--------
ctree.c | 3 ++-
ctree.h | 2 +-
image/main.c | 2 +-
mkfs/common.c | 15 ++++++++-------
print-tree.c | 4 ++--
8 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/chunk-recover.c b/chunk-recover.c
index 89c0eea6..123cd097 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1161,7 +1161,7 @@ static int __rebuild_chunk_root(struct btrfs_trans_handle *trans,
min_devid = dev->devid;
}
btrfs_set_stack_disk_key_objectid(&disk_key, BTRFS_DEV_ITEMS_OBJECTID);
- btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_ITEM_KEY);
+ btrfs_set_stack_disk_key_type(&disk_key, BTRFS_DEV_ITEM_KEY);
btrfs_set_stack_disk_key_offset(&disk_key, min_devid);
cow = btrfs_alloc_free_block(trans, root, root->fs_info->nodesize,
diff --git a/cmds-check.c b/cmds-check.c
index 68ba3448..8c66cff1 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -2624,7 +2624,7 @@ static int repair_tree_block_ref(struct btrfs_trans_handle *trans,
sizeof(*bi));
btrfs_set_stack_disk_key_objectid(©_key,
root->objectid);
- btrfs_set_disk_key_type(©_key, 0);
+ btrfs_set_stack_disk_key_type(©_key, 0);
btrfs_set_stack_disk_key_offset(©_key, 0);
btrfs_set_tree_block_level(eb, bi, level);
@@ -9730,7 +9730,7 @@ static int record_extent(struct btrfs_trans_handle *trans,
btrfs_set_stack_disk_key_objectid(©_key,
rec->info_objectid);
- btrfs_set_disk_key_type(©_key, 0);
+ btrfs_set_stack_disk_key_type(©_key, 0);
btrfs_set_stack_disk_key_offset(©_key, 0);
btrfs_set_tree_block_level(leaf, bi, rec->info_level);
diff --git a/convert/common.c b/convert/common.c
index 6b5f98dd..b1e1dd13 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -198,7 +198,7 @@ static void insert_temp_root_item(struct extent_buffer *buf,
btrfs_set_root_bytenr(&root_item, bytenr);
memset(&disk_key, 0, sizeof(disk_key));
- btrfs_set_disk_key_type(&disk_key, BTRFS_ROOT_ITEM_KEY);
+ btrfs_set_stack_disk_key_type(&disk_key, BTRFS_ROOT_ITEM_KEY);
btrfs_set_stack_disk_key_objectid(&disk_key, objectid);
btrfs_set_stack_disk_key_offset(&disk_key, 0);
@@ -305,7 +305,7 @@ static int insert_temp_dev_item(int fd, struct extent_buffer *buf,
btrfs_set_header_nritems(buf, *slot + 1);
(*itemoff) -= sizeof(*dev_item);
/* setup device item 1, 0 is for replace case */
- btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_ITEM_KEY);
+ btrfs_set_stack_disk_key_type(&disk_key, BTRFS_DEV_ITEM_KEY);
btrfs_set_stack_disk_key_objectid(&disk_key, BTRFS_DEV_ITEMS_OBJECTID);
btrfs_set_stack_disk_key_offset(&disk_key, 1);
btrfs_set_item_key(buf, &disk_key, *slot);
@@ -365,7 +365,7 @@ static int insert_temp_chunk_item(int fd, struct extent_buffer *buf,
btrfs_set_header_nritems(buf, *slot + 1);
(*itemoff) -= btrfs_chunk_item_size(1);
- btrfs_set_disk_key_type(&disk_key, BTRFS_CHUNK_ITEM_KEY);
+ btrfs_set_stack_disk_key_type(&disk_key, BTRFS_CHUNK_ITEM_KEY);
btrfs_set_stack_disk_key_objectid(&disk_key,
BTRFS_FIRST_CHUNK_TREE_OBJECTID);
btrfs_set_stack_disk_key_offset(&disk_key, start);
@@ -469,7 +469,7 @@ static void insert_temp_dev_extent(struct extent_buffer *buf,
btrfs_set_header_nritems(buf, *slot + 1);
(*itemoff) -= sizeof(*dev_extent);
- btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_EXTENT_KEY);
+ btrfs_set_stack_disk_key_type(&disk_key, BTRFS_DEV_EXTENT_KEY);
btrfs_set_stack_disk_key_objectid(&disk_key, 1);
btrfs_set_stack_disk_key_offset(&disk_key, start);
btrfs_set_item_key(buf, &disk_key, *slot);
@@ -596,10 +596,11 @@ static int insert_temp_extent_item(int fd, struct extent_buffer *buf,
*(itemoff) -= itemsize;
if (skinny_metadata) {
- btrfs_set_disk_key_type(&disk_key, BTRFS_METADATA_ITEM_KEY);
+ btrfs_set_stack_disk_key_type(&disk_key,
+ BTRFS_METADATA_ITEM_KEY);
btrfs_set_stack_disk_key_offset(&disk_key, 0);
} else {
- btrfs_set_disk_key_type(&disk_key, BTRFS_EXTENT_ITEM_KEY);
+ btrfs_set_stack_disk_key_type(&disk_key, BTRFS_EXTENT_ITEM_KEY);
btrfs_set_stack_disk_key_offset(&disk_key, cfg->nodesize);
}
btrfs_set_stack_disk_key_objectid(&disk_key, bytenr);
@@ -644,7 +645,7 @@ static int insert_temp_extent_item(int fd, struct extent_buffer *buf,
goto out;
}
if (btrfs_header_nritems(tmp) == 0) {
- btrfs_set_disk_key_type(&tree_info_key, 0);
+ btrfs_set_stack_disk_key_type(&tree_info_key, 0);
btrfs_set_stack_disk_key_objectid(&tree_info_key, 0);
btrfs_set_stack_disk_key_offset(&tree_info_key, 0);
} else {
@@ -667,7 +668,7 @@ static void insert_temp_block_group(struct extent_buffer *buf,
btrfs_set_header_nritems(buf, *slot + 1);
(*itemoff) -= sizeof(bgi);
- btrfs_set_disk_key_type(&disk_key, BTRFS_BLOCK_GROUP_ITEM_KEY);
+ btrfs_set_stack_disk_key_type(&disk_key, BTRFS_BLOCK_GROUP_ITEM_KEY);
btrfs_set_stack_disk_key_objectid(&disk_key, bytenr);
btrfs_set_stack_disk_key_offset(&disk_key, len);
btrfs_set_item_key(buf, &disk_key, *slot);
diff --git a/ctree.c b/ctree.c
index 818bdfda..86df6bd9 100644
--- a/ctree.c
+++ b/ctree.c
@@ -2349,7 +2349,8 @@ int btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path,
btrfs_item_key(leaf, &disk_key, slot);
- if (btrfs_disk_key_type(&disk_key) == BTRFS_EXTENT_DATA_KEY) {
+ if (btrfs_stack_disk_key_type(&disk_key)
+ == BTRFS_EXTENT_DATA_KEY) {
unsigned long ptr;
struct btrfs_file_extent_item *fi;
diff --git a/ctree.h b/ctree.h
index 3a1ddd59..92b294c9 100644
--- a/ctree.h
+++ b/ctree.h
@@ -1931,7 +1931,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_disk_key_objectid, struct btrfs_disk_key,
objectid, 64);
BTRFS_SETGET_STACK_FUNCS(stack_disk_key_offset, struct btrfs_disk_key, offset,
64);
-BTRFS_SETGET_STACK_FUNCS(disk_key_type, struct btrfs_disk_key, type, 8);
+BTRFS_SETGET_STACK_FUNCS(stack_disk_key_type, struct btrfs_disk_key, type, 8);
static inline void btrfs_disk_key_to_cpu(struct btrfs_key *cpu,
struct btrfs_disk_key *disk)
diff --git a/image/main.c b/image/main.c
index 7060ebda..56244586 100644
--- a/image/main.c
+++ b/image/main.c
@@ -1101,7 +1101,7 @@ static void update_super_old(u8 *buffer)
sizeof(struct btrfs_disk_key));
btrfs_set_stack_disk_key_objectid(key, BTRFS_FIRST_CHUNK_TREE_OBJECTID);
- btrfs_set_disk_key_type(key, BTRFS_CHUNK_ITEM_KEY);
+ btrfs_set_stack_disk_key_type(key, BTRFS_CHUNK_ITEM_KEY);
btrfs_set_stack_disk_key_offset(key, 0);
btrfs_set_stack_chunk_length(chunk, (u64)-1);
diff --git a/mkfs/common.c b/mkfs/common.c
index f4655b63..0fec2bdd 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -61,7 +61,7 @@ static int btrfs_create_tree_root(int fd, struct btrfs_mkfs_config *cfg,
btrfs_set_root_used(&root_item, cfg->nodesize);
btrfs_set_root_generation(&root_item, 1);
- btrfs_set_disk_key_type(&disk_key, BTRFS_ROOT_ITEM_KEY);
+ btrfs_set_stack_disk_key_type(&disk_key, BTRFS_ROOT_ITEM_KEY);
btrfs_set_stack_disk_key_offset(&disk_key, 0);
itemoff = __BTRFS_LEAF_DATA_SIZE(cfg->nodesize) - sizeof(root_item);
@@ -226,11 +226,11 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
itemoff -= item_size;
btrfs_set_stack_disk_key_objectid(&disk_key, cfg->blocks[i]);
if (skinny_metadata) {
- btrfs_set_disk_key_type(&disk_key,
+ btrfs_set_stack_disk_key_type(&disk_key,
BTRFS_METADATA_ITEM_KEY);
btrfs_set_stack_disk_key_offset(&disk_key, 0);
} else {
- btrfs_set_disk_key_type(&disk_key,
+ btrfs_set_stack_disk_key_type(&disk_key,
BTRFS_EXTENT_ITEM_KEY);
btrfs_set_stack_disk_key_offset(&disk_key,
cfg->nodesize);
@@ -252,7 +252,8 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
ref_root = reference_root_table[i];
btrfs_set_stack_disk_key_objectid(&disk_key, cfg->blocks[i]);
btrfs_set_stack_disk_key_offset(&disk_key, ref_root);
- btrfs_set_disk_key_type(&disk_key, BTRFS_TREE_BLOCK_REF_KEY);
+ btrfs_set_stack_disk_key_type(&disk_key,
+ BTRFS_TREE_BLOCK_REF_KEY);
btrfs_set_item_key(buf, &disk_key, nritems);
btrfs_set_item_offset(buf, btrfs_item_nr(nritems),
itemoff);
@@ -279,7 +280,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
/* first device 1 (there is no device 0) */
btrfs_set_stack_disk_key_objectid(&disk_key, BTRFS_DEV_ITEMS_OBJECTID);
btrfs_set_stack_disk_key_offset(&disk_key, 1);
- btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_ITEM_KEY);
+ btrfs_set_stack_disk_key_type(&disk_key, BTRFS_DEV_ITEM_KEY);
btrfs_set_item_key(buf, &disk_key, nritems);
btrfs_set_item_offset(buf, btrfs_item_nr(nritems), itemoff);
btrfs_set_item_size(buf, btrfs_item_nr(nritems), item_size);
@@ -312,7 +313,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_stack_disk_key_objectid(&disk_key,
BTRFS_FIRST_CHUNK_TREE_OBJECTID);
btrfs_set_stack_disk_key_offset(&disk_key, 0);
- btrfs_set_disk_key_type(&disk_key, BTRFS_CHUNK_ITEM_KEY);
+ btrfs_set_stack_disk_key_type(&disk_key, BTRFS_CHUNK_ITEM_KEY);
btrfs_set_item_key(buf, &disk_key, nritems);
btrfs_set_item_offset(buf, btrfs_item_nr(nritems), itemoff);
btrfs_set_item_size(buf, btrfs_item_nr(nritems), item_size);
@@ -366,7 +367,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_stack_disk_key_objectid(&disk_key, 1);
btrfs_set_stack_disk_key_offset(&disk_key, 0);
- btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_EXTENT_KEY);
+ btrfs_set_stack_disk_key_type(&disk_key, BTRFS_DEV_EXTENT_KEY);
btrfs_set_item_key(buf, &disk_key, nritems);
btrfs_set_item_offset(buf, btrfs_item_nr(nritems), itemoff);
btrfs_set_item_size(buf, btrfs_item_nr(nritems),
diff --git a/print-tree.c b/print-tree.c
index 6e7ccfeb..ff4e1199 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -808,7 +808,7 @@ void print_objectid(FILE *stream, u64 objectid, u8 type)
void btrfs_print_key(struct btrfs_disk_key *disk_key)
{
u64 objectid = btrfs_stack_disk_key_objectid(disk_key);
- u8 type = btrfs_disk_key_type(disk_key);
+ u8 type = btrfs_stack_disk_key_type(disk_key);
u64 offset = btrfs_stack_disk_key_offset(disk_key);
printf("key (");
@@ -1203,7 +1203,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *eb)
btrfs_item_key(eb, &disk_key, i);
objectid = btrfs_stack_disk_key_objectid(&disk_key);
- type = btrfs_disk_key_type(&disk_key);
+ type = btrfs_stack_disk_key_type(&disk_key);
offset = btrfs_stack_disk_key_offset(&disk_key);
printf("\titem %d ", i);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 07/67] btrfs-progs: add the stack prefix for root_generation set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (5 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 06/67] btrfs-progs: add the stack prefix for disk_key_type " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 08/67] btrfs-progs: add the stack prefix for root_bytenr " Lu Fengqi
` (60 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The root_generation set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfs-list.c | 4 ++--
cmds-check.c | 14 ++++++++------
convert/common.c | 2 +-
convert/main.c | 2 +-
ctree.h | 2 +-
disk-io.c | 4 ++--
mkfs/common.c | 2 +-
mkfs/main.c | 4 ++--
print-tree.c | 2 +-
root-tree.c | 4 ++--
send-utils.c | 2 +-
transaction.c | 4 ++--
12 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/btrfs-list.c b/btrfs-list.c
index ffd143c0..5b870ba6 100644
--- a/btrfs-list.c
+++ b/btrfs-list.c
@@ -747,7 +747,7 @@ static u64 find_root_gen(int fd)
if (sh.objectid == ino_args.treeid &&
sh.type == BTRFS_ROOT_ITEM_KEY) {
max_found = max(max_found,
- btrfs_root_generation(item));
+ btrfs_stack_root_generation(item));
}
}
if (sk->min_offset < (u64)-1)
@@ -1023,7 +1023,7 @@ static int list_subvol_search(int fd, struct root_lookup *root_lookup)
u8 ruuid[BTRFS_UUID_SIZE];
ri = (struct btrfs_root_item *)(args.buf + off);
- gen = btrfs_root_generation(ri);
+ gen = btrfs_stack_root_generation(ri);
flags = btrfs_root_flags(ri);
if(sh.len >
sizeof(struct btrfs_root_item_v0)) {
diff --git a/cmds-check.c b/cmds-check.c
index 8c66cff1..751ac258 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -13521,7 +13521,7 @@ init:
* same block bytenr here.
*/
if (old->start == c->start) {
- btrfs_set_root_generation(&root->root_item,
+ btrfs_set_stack_root_generation(&root->root_item,
trans->transid);
root->root_item.level = btrfs_header_level(root->node);
ret = btrfs_update_root(trans, root->fs_info->tree_root,
@@ -14378,7 +14378,7 @@ static int maybe_repair_root_item(struct btrfs_path *path,
if (btrfs_root_bytenr(&ri) != rii->bytenr ||
btrfs_root_level(&ri) != rii->level ||
- btrfs_root_generation(&ri) != rii->gen) {
+ btrfs_stack_root_generation(&ri) != rii->gen) {
/*
* If we're in repair mode but our caller told us to not update
@@ -14394,21 +14394,23 @@ static int maybe_repair_root_item(struct btrfs_path *path,
" new bytenr %llu, new gen %llu, new level %u\n",
(read_only_mode ? "" : "fixing "),
root_id,
- btrfs_root_bytenr(&ri), btrfs_root_generation(&ri),
+ btrfs_root_bytenr(&ri),
+ btrfs_stack_root_generation(&ri),
btrfs_root_level(&ri),
rii->bytenr, rii->gen, rii->level);
- if (btrfs_root_generation(&ri) > rii->gen) {
+ if (btrfs_stack_root_generation(&ri) > rii->gen) {
fprintf(stderr,
"root %llu has a root item with a more recent gen (%llu) compared to the found root node (%llu)\n",
- root_id, btrfs_root_generation(&ri), rii->gen);
+ root_id, btrfs_stack_root_generation(&ri),
+ rii->gen);
return -EINVAL;
}
if (!read_only_mode) {
btrfs_set_root_bytenr(&ri, rii->bytenr);
btrfs_set_root_level(&ri, rii->level);
- btrfs_set_root_generation(&ri, rii->gen);
+ btrfs_set_stack_root_generation(&ri, rii->gen);
write_extent_buffer(path->nodes[0], &ri,
offset, sizeof(ri));
}
diff --git a/convert/common.c b/convert/common.c
index b1e1dd13..81471e29 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -194,7 +194,7 @@ static void insert_temp_root_item(struct extent_buffer *buf,
btrfs_set_stack_inode_mode(inode_item, S_IFDIR | 0755);
btrfs_set_root_refs(&root_item, 1);
btrfs_set_root_used(&root_item, cfg->nodesize);
- btrfs_set_root_generation(&root_item, 1);
+ btrfs_set_stack_root_generation(&root_item, 1);
btrfs_set_root_bytenr(&root_item, bytenr);
memset(&disk_key, 0, sizeof(disk_key));
diff --git a/convert/main.c b/convert/main.c
index 89f92611..e8aa9d18 100644
--- a/convert/main.c
+++ b/convert/main.c
@@ -855,7 +855,7 @@ static int create_subvol(struct btrfs_trans_handle *trans,
memcpy(&root_item, &root->root_item, sizeof(root_item));
btrfs_set_root_bytenr(&root_item, tmp->start);
btrfs_set_root_level(&root_item, btrfs_header_level(tmp));
- btrfs_set_root_generation(&root_item, trans->transid);
+ btrfs_set_stack_root_generation(&root_item, trans->transid);
free_extent_buffer(tmp);
key.objectid = root_objectid;
diff --git a/ctree.h b/ctree.h
index 92b294c9..18692d30 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2051,7 +2051,7 @@ BTRFS_SETGET_FUNCS(disk_root_refs, struct btrfs_root_item, refs, 32);
BTRFS_SETGET_FUNCS(disk_root_bytenr, struct btrfs_root_item, bytenr, 64);
BTRFS_SETGET_FUNCS(disk_root_level, struct btrfs_root_item, level, 8);
-BTRFS_SETGET_STACK_FUNCS(root_generation, struct btrfs_root_item,
+BTRFS_SETGET_STACK_FUNCS(stack_root_generation, struct btrfs_root_item,
generation, 64);
BTRFS_SETGET_STACK_FUNCS(root_bytenr, struct btrfs_root_item, bytenr, 64);
BTRFS_SETGET_STACK_FUNCS(root_level, struct btrfs_root_item, level, 8);
diff --git a/disk-io.c b/disk-io.c
index f5edc479..3b9d94ca 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -494,7 +494,7 @@ static int find_and_setup_root(struct btrfs_root *tree_root,
if (ret)
return ret;
- generation = btrfs_root_generation(&root->root_item);
+ generation = btrfs_stack_root_generation(&root->root_item);
root->node = read_tree_block(fs_info,
btrfs_root_bytenr(&root->root_item), generation);
if (!extent_buffer_uptodate(root->node))
@@ -606,7 +606,7 @@ out:
free(root);
return ERR_PTR(ret);
}
- generation = btrfs_root_generation(&root->root_item);
+ generation = btrfs_stack_root_generation(&root->root_item);
root->node = read_tree_block(fs_info,
btrfs_root_bytenr(&root->root_item), generation);
if (!extent_buffer_uptodate(root->node)) {
diff --git a/mkfs/common.c b/mkfs/common.c
index 0fec2bdd..4839e3b7 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -59,7 +59,7 @@ static int btrfs_create_tree_root(int fd, struct btrfs_mkfs_config *cfg,
btrfs_set_stack_inode_mode(inode_item, S_IFDIR | 0755);
btrfs_set_root_refs(&root_item, 1);
btrfs_set_root_used(&root_item, cfg->nodesize);
- btrfs_set_root_generation(&root_item, 1);
+ btrfs_set_stack_root_generation(&root_item, 1);
btrfs_set_stack_disk_key_type(&disk_key, BTRFS_ROOT_ITEM_KEY);
btrfs_set_stack_disk_key_offset(&disk_key, 0);
diff --git a/mkfs/main.c b/mkfs/main.c
index d817ad8d..b6727903 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -204,7 +204,7 @@ static int __recow_root(struct btrfs_trans_handle *trans,
struct extent_buffer *tmp;
int ret;
- if (trans->transid != btrfs_root_generation(&root->root_item)) {
+ if (trans->transid != btrfs_stack_root_generation(&root->root_item)) {
extent_buffer_get(root->node);
ret = __btrfs_cow_block(trans, root, root->node,
NULL, 0, &tmp, 0, 0);
@@ -338,7 +338,7 @@ static int create_tree(struct btrfs_trans_handle *trans,
memcpy(&root_item, &root->root_item, sizeof(root_item));
btrfs_set_root_bytenr(&root_item, tmp->start);
btrfs_set_root_level(&root_item, btrfs_header_level(tmp));
- btrfs_set_root_generation(&root_item, trans->transid);
+ btrfs_set_stack_root_generation(&root_item, trans->transid);
free_extent_buffer(tmp);
location.objectid = objectid;
diff --git a/print-tree.c b/print-tree.c
index ff4e1199..e7176af1 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -588,7 +588,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
root_flags_to_str(btrfs_root_flags(&root_item), flags_str);
printf("\t\tgeneration %llu root_dirid %llu bytenr %llu level %hhu refs %u\n",
- (unsigned long long)btrfs_root_generation(&root_item),
+ (unsigned long long)btrfs_stack_root_generation(&root_item),
(unsigned long long)btrfs_root_dirid(&root_item),
(unsigned long long)btrfs_root_bytenr(&root_item),
btrfs_root_level(&root_item),
diff --git a/root-tree.c b/root-tree.c
index 6b8f8c1c..2de63f6c 100644
--- a/root-tree.c
+++ b/root-tree.c
@@ -121,7 +121,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
* Update generation_v2 so at the next mount we know the new root
* fields are valid.
*/
- btrfs_set_root_generation_v2(item, btrfs_root_generation(item));
+ btrfs_set_root_generation_v2(item, btrfs_stack_root_generation(item));
write_extent_buffer(l, item, ptr, sizeof(*item));
btrfs_mark_buffer_dirty(path->nodes[0]);
@@ -139,7 +139,7 @@ int btrfs_insert_root(struct btrfs_trans_handle *trans, struct btrfs_root
/*
* Make sure generation v1 and v2 match. See update_root for details.
*/
- btrfs_set_root_generation_v2(item, btrfs_root_generation(item));
+ btrfs_set_root_generation_v2(item, btrfs_stack_root_generation(item));
ret = btrfs_insert_item(trans, root, key, item, sizeof(*item));
return ret;
}
diff --git a/send-utils.c b/send-utils.c
index 384cc5b7..3da6b9c7 100644
--- a/send-utils.c
+++ b/send-utils.c
@@ -153,7 +153,7 @@ static int btrfs_read_root_item(int mnt_fd, u64 root_id,
return ret;
if (read_len < sizeof(*item) ||
- btrfs_root_generation(item) != btrfs_root_generation_v2(item))
+ btrfs_stack_root_generation(item) != btrfs_root_generation_v2(item))
memset(&item->generation_v2, 0,
sizeof(*item) - offsetof(struct btrfs_root_item,
generation_v2));
diff --git a/transaction.c b/transaction.c
index ad705728..1cc27ff0 100644
--- a/transaction.c
+++ b/transaction.c
@@ -67,7 +67,7 @@ static int update_cowonly_root(struct btrfs_trans_handle *trans,
break;
btrfs_set_root_bytenr(&root->root_item,
root->node->start);
- btrfs_set_root_generation(&root->root_item,
+ btrfs_set_stack_root_generation(&root->root_item,
trans->transid);
root->root_item.level = btrfs_header_level(root->node);
ret = btrfs_update_root(trans, tree_root,
@@ -158,7 +158,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
root->commit_root = NULL;
btrfs_set_root_bytenr(&root->root_item, root->node->start);
- btrfs_set_root_generation(&root->root_item, trans->transid);
+ btrfs_set_stack_root_generation(&root->root_item, trans->transid);
root->root_item.level = btrfs_header_level(root->node);
ret = btrfs_update_root(trans, root->fs_info->tree_root,
&root->root_key, &root->root_item);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 08/67] btrfs-progs: add the stack prefix for root_bytenr set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (6 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 07/67] btrfs-progs: add the stack prefix for root_generation " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 09/67] btrfs-progs: add the stack prefix for root_level " Lu Fengqi
` (59 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The root_bytenr set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-check.c | 12 ++++++------
cmds-inspect-dump-tree.c | 3 ++-
cmds-restore.c | 2 +-
convert/common.c | 2 +-
convert/main.c | 2 +-
ctree.h | 2 +-
disk-io.c | 4 ++--
mkfs/common.c | 2 +-
mkfs/main.c | 2 +-
print-tree.c | 2 +-
transaction.c | 6 +++---
11 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/cmds-check.c b/cmds-check.c
index 751ac258..3c366109 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -2194,7 +2194,7 @@ static int calc_extent_flag_v2(struct btrfs_root *root, struct extent_buffer *eb
goto normal;
/* root node */
- if (eb->start == btrfs_root_bytenr(ri))
+ if (eb->start == btrfs_stack_root_bytenr(ri))
goto normal;
if (btrfs_header_flag(eb, BTRFS_HEADER_FLAG_RELOC))
@@ -11544,7 +11544,7 @@ again:
level = btrfs_root_level(&ri);
ret = add_root_item_to_list(&normal_trees,
found_key.objectid,
- btrfs_root_bytenr(&ri),
+ btrfs_stack_root_bytenr(&ri),
last_snapshot, level,
0, NULL);
if (ret < 0)
@@ -11556,7 +11556,7 @@ again:
&ri.drop_progress);
ret = add_root_item_to_list(&dropping_trees,
objectid,
- btrfs_root_bytenr(&ri),
+ btrfs_stack_root_bytenr(&ri),
last_snapshot, level,
ri.drop_level, &found_key);
if (ret < 0)
@@ -14376,7 +14376,7 @@ static int maybe_repair_root_item(struct btrfs_path *path,
offset = btrfs_item_ptr_offset(path->nodes[0], path->slots[0]);
read_extent_buffer(path->nodes[0], &ri, offset, sizeof(ri));
- if (btrfs_root_bytenr(&ri) != rii->bytenr ||
+ if (btrfs_stack_root_bytenr(&ri) != rii->bytenr ||
btrfs_root_level(&ri) != rii->level ||
btrfs_stack_root_generation(&ri) != rii->gen) {
@@ -14394,7 +14394,7 @@ static int maybe_repair_root_item(struct btrfs_path *path,
" new bytenr %llu, new gen %llu, new level %u\n",
(read_only_mode ? "" : "fixing "),
root_id,
- btrfs_root_bytenr(&ri),
+ btrfs_stack_root_bytenr(&ri),
btrfs_stack_root_generation(&ri),
btrfs_root_level(&ri),
rii->bytenr, rii->gen, rii->level);
@@ -14408,7 +14408,7 @@ static int maybe_repair_root_item(struct btrfs_path *path,
}
if (!read_only_mode) {
- btrfs_set_root_bytenr(&ri, rii->bytenr);
+ btrfs_set_stack_root_bytenr(&ri, rii->bytenr);
btrfs_set_root_level(&ri, rii->level);
btrfs_set_stack_root_generation(&ri, rii->gen);
write_extent_buffer(path->nodes[0], &ri,
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index df44bb63..66e7227d 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -438,7 +438,8 @@ again:
offset = btrfs_item_ptr_offset(leaf, slot);
read_extent_buffer(leaf, &ri, offset, sizeof(ri));
- buf = read_tree_block(info, btrfs_root_bytenr(&ri), 0);
+ buf = read_tree_block(info,
+ btrfs_stack_root_bytenr(&ri), 0);
if (!extent_buffer_uptodate(buf))
goto next;
if (tree_id && found_key.objectid != tree_id) {
diff --git a/cmds-restore.c b/cmds-restore.c
index 6196a1ed..2f72fbbf 100644
--- a/cmds-restore.c
+++ b/cmds-restore.c
@@ -1263,7 +1263,7 @@ static int do_list_roots(struct btrfs_root *root)
read_extent_buffer(leaf, &ri, offset, sizeof(ri));
printf(" tree ");
btrfs_print_key(&disk_key);
- printf(" %Lu level %d\n", btrfs_root_bytenr(&ri),
+ printf(" %Lu level %d\n", btrfs_stack_root_bytenr(&ri),
btrfs_root_level(&ri));
path.slots[0]++;
}
diff --git a/convert/common.c b/convert/common.c
index 81471e29..17b480b9 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -195,7 +195,7 @@ static void insert_temp_root_item(struct extent_buffer *buf,
btrfs_set_root_refs(&root_item, 1);
btrfs_set_root_used(&root_item, cfg->nodesize);
btrfs_set_stack_root_generation(&root_item, 1);
- btrfs_set_root_bytenr(&root_item, bytenr);
+ btrfs_set_stack_root_bytenr(&root_item, bytenr);
memset(&disk_key, 0, sizeof(disk_key));
btrfs_set_stack_disk_key_type(&disk_key, BTRFS_ROOT_ITEM_KEY);
diff --git a/convert/main.c b/convert/main.c
index e8aa9d18..8f0921c0 100644
--- a/convert/main.c
+++ b/convert/main.c
@@ -853,7 +853,7 @@ static int create_subvol(struct btrfs_trans_handle *trans,
return ret;
memcpy(&root_item, &root->root_item, sizeof(root_item));
- btrfs_set_root_bytenr(&root_item, tmp->start);
+ btrfs_set_stack_root_bytenr(&root_item, tmp->start);
btrfs_set_root_level(&root_item, btrfs_header_level(tmp));
btrfs_set_stack_root_generation(&root_item, trans->transid);
free_extent_buffer(tmp);
diff --git a/ctree.h b/ctree.h
index 18692d30..f27326bb 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2053,7 +2053,7 @@ BTRFS_SETGET_FUNCS(disk_root_level, struct btrfs_root_item, level, 8);
BTRFS_SETGET_STACK_FUNCS(stack_root_generation, struct btrfs_root_item,
generation, 64);
-BTRFS_SETGET_STACK_FUNCS(root_bytenr, struct btrfs_root_item, bytenr, 64);
+BTRFS_SETGET_STACK_FUNCS(stack_root_bytenr, struct btrfs_root_item, bytenr, 64);
BTRFS_SETGET_STACK_FUNCS(root_level, struct btrfs_root_item, level, 8);
BTRFS_SETGET_STACK_FUNCS(root_dirid, struct btrfs_root_item, root_dirid, 64);
BTRFS_SETGET_STACK_FUNCS(root_refs, struct btrfs_root_item, refs, 32);
diff --git a/disk-io.c b/disk-io.c
index 3b9d94ca..6f9258d2 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -496,7 +496,7 @@ static int find_and_setup_root(struct btrfs_root *tree_root,
generation = btrfs_stack_root_generation(&root->root_item);
root->node = read_tree_block(fs_info,
- btrfs_root_bytenr(&root->root_item), generation);
+ btrfs_stack_root_bytenr(&root->root_item), generation);
if (!extent_buffer_uptodate(root->node))
return -EIO;
@@ -608,7 +608,7 @@ out:
}
generation = btrfs_stack_root_generation(&root->root_item);
root->node = read_tree_block(fs_info,
- btrfs_root_bytenr(&root->root_item), generation);
+ btrfs_stack_root_bytenr(&root->root_item), generation);
if (!extent_buffer_uptodate(root->node)) {
free(root);
return ERR_PTR(-EIO);
diff --git a/mkfs/common.c b/mkfs/common.c
index 4839e3b7..c3599861 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -70,7 +70,7 @@ static int btrfs_create_tree_root(int fd, struct btrfs_mkfs_config *cfg,
|| blk == MKFS_CHUNK_TREE)
continue;
- btrfs_set_root_bytenr(&root_item, cfg->blocks[blk]);
+ btrfs_set_stack_root_bytenr(&root_item, cfg->blocks[blk]);
btrfs_set_stack_disk_key_objectid(&disk_key,
reference_root_table[blk]);
btrfs_set_item_key(buf, &disk_key, nritems);
diff --git a/mkfs/main.c b/mkfs/main.c
index b6727903..cda0c65b 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -336,7 +336,7 @@ static int create_tree(struct btrfs_trans_handle *trans,
return ret;
memcpy(&root_item, &root->root_item, sizeof(root_item));
- btrfs_set_root_bytenr(&root_item, tmp->start);
+ btrfs_set_stack_root_bytenr(&root_item, tmp->start);
btrfs_set_root_level(&root_item, btrfs_header_level(tmp));
btrfs_set_stack_root_generation(&root_item, trans->transid);
free_extent_buffer(tmp);
diff --git a/print-tree.c b/print-tree.c
index e7176af1..6f5f362b 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -590,7 +590,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
printf("\t\tgeneration %llu root_dirid %llu bytenr %llu level %hhu refs %u\n",
(unsigned long long)btrfs_stack_root_generation(&root_item),
(unsigned long long)btrfs_root_dirid(&root_item),
- (unsigned long long)btrfs_root_bytenr(&root_item),
+ (unsigned long long)btrfs_stack_root_bytenr(&root_item),
btrfs_root_level(&root_item),
btrfs_root_refs(&root_item));
printf("\t\tlastsnap %llu byte_limit %llu bytes_used %llu flags 0x%llx(%s)\n",
diff --git a/transaction.c b/transaction.c
index 1cc27ff0..f709bc66 100644
--- a/transaction.c
+++ b/transaction.c
@@ -62,10 +62,10 @@ static int update_cowonly_root(struct btrfs_trans_handle *trans,
btrfs_write_dirty_block_groups(trans, root);
while(1) {
- old_root_bytenr = btrfs_root_bytenr(&root->root_item);
+ old_root_bytenr = btrfs_stack_root_bytenr(&root->root_item);
if (old_root_bytenr == root->node->start)
break;
- btrfs_set_root_bytenr(&root->root_item,
+ btrfs_set_stack_root_bytenr(&root->root_item,
root->node->start);
btrfs_set_stack_root_generation(&root->root_item,
trans->transid);
@@ -157,7 +157,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
free_extent_buffer(root->commit_root);
root->commit_root = NULL;
- btrfs_set_root_bytenr(&root->root_item, root->node->start);
+ btrfs_set_stack_root_bytenr(&root->root_item, root->node->start);
btrfs_set_stack_root_generation(&root->root_item, trans->transid);
root->root_item.level = btrfs_header_level(root->node);
ret = btrfs_update_root(trans, root->fs_info->tree_root,
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 09/67] btrfs-progs: add the stack prefix for root_level set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (7 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 08/67] btrfs-progs: add the stack prefix for root_bytenr " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 10/67] btrfs-progs: add the stack prefix for root_dirid " Lu Fengqi
` (58 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The root_level set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
backref.c | 2 +-
cmds-check.c | 10 +++++-----
cmds-restore.c | 2 +-
convert/main.c | 2 +-
ctree.h | 2 +-
mkfs/main.c | 2 +-
print-tree.c | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/backref.c b/backref.c
index 27309e07..171da777 100644
--- a/backref.c
+++ b/backref.c
@@ -332,7 +332,7 @@ static int __resolve_indirect_ref(struct btrfs_fs_info *fs_info,
goto out;
}
- root_level = btrfs_root_level(&root->root_item);
+ root_level = btrfs_stack_root_level(&root->root_item);
if (root_level + 1 == level)
goto out;
diff --git a/cmds-check.c b/cmds-check.c
index 3c366109..cd2ad5f4 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -11541,7 +11541,7 @@ again:
last_snapshot = btrfs_root_last_snapshot(&ri);
if (btrfs_stack_disk_key_objectid(&ri.drop_progress)
== 0) {
- level = btrfs_root_level(&ri);
+ level = btrfs_stack_root_level(&ri);
ret = add_root_item_to_list(&normal_trees,
found_key.objectid,
btrfs_stack_root_bytenr(&ri),
@@ -11550,7 +11550,7 @@ again:
if (ret < 0)
goto out;
} else {
- level = btrfs_root_level(&ri);
+ level = btrfs_stack_root_level(&ri);
objectid = found_key.objectid;
btrfs_disk_key_to_cpu(&found_key,
&ri.drop_progress);
@@ -14377,7 +14377,7 @@ static int maybe_repair_root_item(struct btrfs_path *path,
read_extent_buffer(path->nodes[0], &ri, offset, sizeof(ri));
if (btrfs_stack_root_bytenr(&ri) != rii->bytenr ||
- btrfs_root_level(&ri) != rii->level ||
+ btrfs_stack_root_level(&ri) != rii->level ||
btrfs_stack_root_generation(&ri) != rii->gen) {
/*
@@ -14396,7 +14396,7 @@ static int maybe_repair_root_item(struct btrfs_path *path,
root_id,
btrfs_stack_root_bytenr(&ri),
btrfs_stack_root_generation(&ri),
- btrfs_root_level(&ri),
+ btrfs_stack_root_level(&ri),
rii->bytenr, rii->gen, rii->level);
if (btrfs_stack_root_generation(&ri) > rii->gen) {
@@ -14409,7 +14409,7 @@ static int maybe_repair_root_item(struct btrfs_path *path,
if (!read_only_mode) {
btrfs_set_stack_root_bytenr(&ri, rii->bytenr);
- btrfs_set_root_level(&ri, rii->level);
+ btrfs_set_stack_root_level(&ri, rii->level);
btrfs_set_stack_root_generation(&ri, rii->gen);
write_extent_buffer(path->nodes[0], &ri,
offset, sizeof(ri));
diff --git a/cmds-restore.c b/cmds-restore.c
index 2f72fbbf..37368766 100644
--- a/cmds-restore.c
+++ b/cmds-restore.c
@@ -1264,7 +1264,7 @@ static int do_list_roots(struct btrfs_root *root)
printf(" tree ");
btrfs_print_key(&disk_key);
printf(" %Lu level %d\n", btrfs_stack_root_bytenr(&ri),
- btrfs_root_level(&ri));
+ btrfs_stack_root_level(&ri));
path.slots[0]++;
}
btrfs_release_path(&path);
diff --git a/convert/main.c b/convert/main.c
index 8f0921c0..7453077a 100644
--- a/convert/main.c
+++ b/convert/main.c
@@ -854,7 +854,7 @@ static int create_subvol(struct btrfs_trans_handle *trans,
memcpy(&root_item, &root->root_item, sizeof(root_item));
btrfs_set_stack_root_bytenr(&root_item, tmp->start);
- btrfs_set_root_level(&root_item, btrfs_header_level(tmp));
+ btrfs_set_stack_root_level(&root_item, btrfs_header_level(tmp));
btrfs_set_stack_root_generation(&root_item, trans->transid);
free_extent_buffer(tmp);
diff --git a/ctree.h b/ctree.h
index f27326bb..d954c032 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2054,7 +2054,7 @@ BTRFS_SETGET_FUNCS(disk_root_level, struct btrfs_root_item, level, 8);
BTRFS_SETGET_STACK_FUNCS(stack_root_generation, struct btrfs_root_item,
generation, 64);
BTRFS_SETGET_STACK_FUNCS(stack_root_bytenr, struct btrfs_root_item, bytenr, 64);
-BTRFS_SETGET_STACK_FUNCS(root_level, struct btrfs_root_item, level, 8);
+BTRFS_SETGET_STACK_FUNCS(stack_root_level, struct btrfs_root_item, level, 8);
BTRFS_SETGET_STACK_FUNCS(root_dirid, struct btrfs_root_item, root_dirid, 64);
BTRFS_SETGET_STACK_FUNCS(root_refs, struct btrfs_root_item, refs, 32);
BTRFS_SETGET_STACK_FUNCS(root_flags, struct btrfs_root_item, flags, 64);
diff --git a/mkfs/main.c b/mkfs/main.c
index cda0c65b..ae237e14 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -337,7 +337,7 @@ static int create_tree(struct btrfs_trans_handle *trans,
memcpy(&root_item, &root->root_item, sizeof(root_item));
btrfs_set_stack_root_bytenr(&root_item, tmp->start);
- btrfs_set_root_level(&root_item, btrfs_header_level(tmp));
+ btrfs_set_stack_root_level(&root_item, btrfs_header_level(tmp));
btrfs_set_stack_root_generation(&root_item, trans->transid);
free_extent_buffer(tmp);
diff --git a/print-tree.c b/print-tree.c
index 6f5f362b..741fc9a9 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -591,7 +591,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
(unsigned long long)btrfs_stack_root_generation(&root_item),
(unsigned long long)btrfs_root_dirid(&root_item),
(unsigned long long)btrfs_stack_root_bytenr(&root_item),
- btrfs_root_level(&root_item),
+ btrfs_stack_root_level(&root_item),
btrfs_root_refs(&root_item));
printf("\t\tlastsnap %llu byte_limit %llu bytes_used %llu flags 0x%llx(%s)\n",
(unsigned long long)btrfs_root_last_snapshot(&root_item),
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 10/67] btrfs-progs: add the stack prefix for root_dirid set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (8 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 09/67] btrfs-progs: add the stack prefix for root_level " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 11/67] btrfs-progs: add the stack prefix for root_refs " Lu Fengqi
` (57 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The root_dirid set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-check.c | 4 ++--
convert/main.c | 4 ++--
ctree.h | 3 ++-
inode.c | 2 +-
mkfs/main.c | 2 +-
print-tree.c | 2 +-
utils.c | 2 +-
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/cmds-check.c b/cmds-check.c
index cd2ad5f4..836f3c7e 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -3178,7 +3178,7 @@ static int repair_inode_backrefs(struct btrfs_root *root,
int delete)
{
struct inode_backref *tmp, *backref;
- u64 root_dirid = btrfs_root_dirid(&root->root_item);
+ u64 root_dirid = btrfs_stack_root_dirid(&root->root_item);
int ret = 0;
int repaired = 0;
@@ -3844,7 +3844,7 @@ static int check_inode_recs(struct btrfs_root *root,
int ret = 0;
int err = 0;
u64 error = 0;
- u64 root_dirid = btrfs_root_dirid(&root->root_item);
+ u64 root_dirid = btrfs_stack_root_dirid(&root->root_item);
if (btrfs_root_refs(&root->root_item) == 0) {
if (!cache_tree_empty(inode_cache))
diff --git a/convert/main.c b/convert/main.c
index 7453077a..a3bcfbd3 100644
--- a/convert/main.c
+++ b/convert/main.c
@@ -981,7 +981,7 @@ static int init_btrfs(struct btrfs_mkfs_config *cfg, struct btrfs_root *root,
btrfs_super_root_dir(fs_info->super_copy), 0);
if (ret)
goto err;
- btrfs_set_root_dirid(&fs_info->fs_root->root_item,
+ btrfs_set_stack_root_dirid(&fs_info->fs_root->root_item,
BTRFS_FIRST_FREE_OBJECTID);
/* subvol for fs image file */
@@ -1578,7 +1578,7 @@ static int do_rollback(const char *devname)
}
/* Search the image file */
- root_dir = btrfs_root_dirid(&image_root->root_item);
+ root_dir = btrfs_stack_root_dirid(&image_root->root_item);
dir = btrfs_lookup_dir_item(NULL, image_root, &path, root_dir,
image_name, strlen(image_name), 0);
diff --git a/ctree.h b/ctree.h
index d954c032..7a59665b 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2055,7 +2055,8 @@ BTRFS_SETGET_STACK_FUNCS(stack_root_generation, struct btrfs_root_item,
generation, 64);
BTRFS_SETGET_STACK_FUNCS(stack_root_bytenr, struct btrfs_root_item, bytenr, 64);
BTRFS_SETGET_STACK_FUNCS(stack_root_level, struct btrfs_root_item, level, 8);
-BTRFS_SETGET_STACK_FUNCS(root_dirid, struct btrfs_root_item, root_dirid, 64);
+BTRFS_SETGET_STACK_FUNCS(stack_root_dirid, struct btrfs_root_item, root_dirid,
+ 64);
BTRFS_SETGET_STACK_FUNCS(root_refs, struct btrfs_root_item, refs, 32);
BTRFS_SETGET_STACK_FUNCS(root_flags, struct btrfs_root_item, flags, 64);
BTRFS_SETGET_STACK_FUNCS(root_used, struct btrfs_root_item, bytes_used, 64);
diff --git a/inode.c b/inode.c
index 2398bca4..a5c69b1d 100644
--- a/inode.c
+++ b/inode.c
@@ -588,7 +588,7 @@ struct btrfs_root *btrfs_mksubvol(struct btrfs_root *root,
struct btrfs_inode_item *inode_item;
struct extent_buffer *leaf;
struct btrfs_key key;
- u64 dirid = btrfs_root_dirid(&root->root_item);
+ u64 dirid = btrfs_stack_root_dirid(&root->root_item);
u64 index = 2;
char buf[BTRFS_NAME_LEN + 1]; /* for snprintf null */
int len;
diff --git a/mkfs/main.c b/mkfs/main.c
index ae237e14..107c391e 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -835,7 +835,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
btrfs_init_path(&path);
- root_dir_key.objectid = btrfs_root_dirid(&root->root_item);
+ root_dir_key.objectid = btrfs_stack_root_dirid(&root->root_item);
root_dir_key.offset = 0;
root_dir_key.type = BTRFS_INODE_ITEM_KEY;
ret = btrfs_lookup_inode(trans, root, &path, &root_dir_key, 1);
diff --git a/print-tree.c b/print-tree.c
index 741fc9a9..7a1626ea 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -589,7 +589,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
printf("\t\tgeneration %llu root_dirid %llu bytenr %llu level %hhu refs %u\n",
(unsigned long long)btrfs_stack_root_generation(&root_item),
- (unsigned long long)btrfs_root_dirid(&root_item),
+ (unsigned long long)btrfs_stack_root_dirid(&root_item),
(unsigned long long)btrfs_stack_root_bytenr(&root_item),
btrfs_stack_root_level(&root_item),
btrfs_root_refs(&root_item));
diff --git a/utils.c b/utils.c
index 524f463d..2f57617f 100644
--- a/utils.c
+++ b/utils.c
@@ -402,7 +402,7 @@ int btrfs_make_root_dir(struct btrfs_trans_handle *trans,
if (ret)
goto error;
- btrfs_set_root_dirid(&root->root_item, objectid);
+ btrfs_set_stack_root_dirid(&root->root_item, objectid);
ret = 0;
error:
return ret;
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 11/67] btrfs-progs: add the stack prefix for root_refs set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (9 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 10/67] btrfs-progs: add the stack prefix for root_dirid " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 12/67] btrfs-progs: add the stack prefix for root_flags " Lu Fengqi
` (56 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The root_refs set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-check.c | 16 ++++++++--------
convert/common.c | 2 +-
ctree.h | 2 +-
mkfs/common.c | 2 +-
print-tree.c | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/cmds-check.c b/cmds-check.c
index 836f3c7e..b79e9f6c 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -1449,7 +1449,7 @@ static int enter_shared_node(struct btrfs_root *root, u64 bytenr, u32 refs,
}
if (wc->root_level == wc->active_node &&
- btrfs_root_refs(&root->root_item) == 0) {
+ btrfs_stack_root_refs(&root->root_item) == 0) {
if (--node->refs == 0) {
free_inode_recs_tree(&node->root_cache);
free_inode_recs_tree(&node->inode_cache);
@@ -1490,7 +1490,7 @@ static int leave_shared_node(struct btrfs_root *root,
dest = wc->nodes[wc->active_node];
if (wc->active_node < wc->root_level ||
- btrfs_root_refs(&root->root_item) > 0) {
+ btrfs_stack_root_refs(&root->root_item) > 0) {
BUG_ON(node->refs <= 1);
splice_shared_node(node, dest);
} else {
@@ -1921,7 +1921,7 @@ static int process_one_leaf(struct btrfs_root *root, struct extent_buffer *eb,
struct shared_node *active_node;
if (wc->root_level == wc->active_node &&
- btrfs_root_refs(&root->root_item) == 0)
+ btrfs_stack_root_refs(&root->root_item) == 0)
return 0;
active_node = wc->nodes[wc->active_node];
@@ -3846,7 +3846,7 @@ static int check_inode_recs(struct btrfs_root *root,
u64 error = 0;
u64 root_dirid = btrfs_stack_root_dirid(&root->root_item);
- if (btrfs_root_refs(&root->root_item) == 0) {
+ if (btrfs_stack_root_refs(&root->root_item) == 0) {
if (!cache_tree_empty(inode_cache))
fprintf(stderr, "warning line %d\n", __LINE__);
return 0;
@@ -4453,7 +4453,7 @@ static int check_fs_root(struct btrfs_root *root,
if (root->root_key.objectid != BTRFS_TREE_RELOC_OBJECTID) {
rec = get_root_rec(root_cache, root->root_key.objectid);
BUG_ON(IS_ERR(rec));
- if (btrfs_root_refs(root_item) > 0)
+ if (btrfs_stack_root_refs(root_item) > 0)
rec->found_root_item = 1;
}
@@ -4489,7 +4489,7 @@ static int check_fs_root(struct btrfs_root *root,
if (status != BTRFS_TREE_BLOCK_CLEAN)
return -EIO;
- if (btrfs_root_refs(root_item) > 0 ||
+ if (btrfs_stack_root_refs(root_item) > 0 ||
btrfs_stack_disk_key_objectid(&root_item->drop_progress) == 0) {
path.nodes[level] = root->node;
extent_buffer_get(root->node);
@@ -6442,7 +6442,7 @@ static int check_fs_first_inode(struct btrfs_root *root, unsigned int ext_ref)
key.offset = 0;
/* For root being dropped, we don't need to check first inode */
- if (btrfs_root_refs(&root->root_item) == 0 &&
+ if (btrfs_stack_root_refs(&root->root_item) == 0 &&
btrfs_stack_disk_key_objectid(&root->root_item.drop_progress) >=
BTRFS_FIRST_FREE_OBJECTID)
return 0;
@@ -6588,7 +6588,7 @@ static int check_btrfs_root(struct btrfs_trans_handle *trans,
level = btrfs_header_level(root->node);
btrfs_init_path(&path);
- if (btrfs_root_refs(root_item) > 0 ||
+ if (btrfs_stack_root_refs(root_item) > 0 ||
btrfs_stack_disk_key_objectid(&root_item->drop_progress) == 0) {
path.nodes[level] = root->node;
path.slots[level] = 0;
diff --git a/convert/common.c b/convert/common.c
index 17b480b9..304ee6ed 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -192,7 +192,7 @@ static void insert_temp_root_item(struct extent_buffer *buf,
btrfs_set_stack_inode_nlink(inode_item, 1);
btrfs_set_stack_inode_nbytes(inode_item, cfg->nodesize);
btrfs_set_stack_inode_mode(inode_item, S_IFDIR | 0755);
- btrfs_set_root_refs(&root_item, 1);
+ btrfs_set_stack_root_refs(&root_item, 1);
btrfs_set_root_used(&root_item, cfg->nodesize);
btrfs_set_stack_root_generation(&root_item, 1);
btrfs_set_stack_root_bytenr(&root_item, bytenr);
diff --git a/ctree.h b/ctree.h
index 7a59665b..9b96268a 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2057,7 +2057,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_root_bytenr, struct btrfs_root_item, bytenr, 64);
BTRFS_SETGET_STACK_FUNCS(stack_root_level, struct btrfs_root_item, level, 8);
BTRFS_SETGET_STACK_FUNCS(stack_root_dirid, struct btrfs_root_item, root_dirid,
64);
-BTRFS_SETGET_STACK_FUNCS(root_refs, struct btrfs_root_item, refs, 32);
+BTRFS_SETGET_STACK_FUNCS(stack_root_refs, struct btrfs_root_item, refs, 32);
BTRFS_SETGET_STACK_FUNCS(root_flags, struct btrfs_root_item, flags, 64);
BTRFS_SETGET_STACK_FUNCS(root_used, struct btrfs_root_item, bytes_used, 64);
BTRFS_SETGET_STACK_FUNCS(root_limit, struct btrfs_root_item, byte_limit, 64);
diff --git a/mkfs/common.c b/mkfs/common.c
index c3599861..82859503 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -57,7 +57,7 @@ static int btrfs_create_tree_root(int fd, struct btrfs_mkfs_config *cfg,
btrfs_set_stack_inode_nlink(inode_item, 1);
btrfs_set_stack_inode_nbytes(inode_item, cfg->nodesize);
btrfs_set_stack_inode_mode(inode_item, S_IFDIR | 0755);
- btrfs_set_root_refs(&root_item, 1);
+ btrfs_set_stack_root_refs(&root_item, 1);
btrfs_set_root_used(&root_item, cfg->nodesize);
btrfs_set_stack_root_generation(&root_item, 1);
diff --git a/print-tree.c b/print-tree.c
index 7a1626ea..8c53bb85 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -592,7 +592,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
(unsigned long long)btrfs_stack_root_dirid(&root_item),
(unsigned long long)btrfs_stack_root_bytenr(&root_item),
btrfs_stack_root_level(&root_item),
- btrfs_root_refs(&root_item));
+ btrfs_stack_root_refs(&root_item));
printf("\t\tlastsnap %llu byte_limit %llu bytes_used %llu flags 0x%llx(%s)\n",
(unsigned long long)btrfs_root_last_snapshot(&root_item),
(unsigned long long)btrfs_root_limit(&root_item),
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 12/67] btrfs-progs: add the stack prefix for root_flags set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (10 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 11/67] btrfs-progs: add the stack prefix for root_refs " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 13/67] btrfs-progs: add the stack prefix for root_used " Lu Fengqi
` (55 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The root_flags set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfs-list.c | 2 +-
ctree.h | 2 +-
print-tree.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/btrfs-list.c b/btrfs-list.c
index 5b870ba6..85e34116 100644
--- a/btrfs-list.c
+++ b/btrfs-list.c
@@ -1024,7 +1024,7 @@ static int list_subvol_search(int fd, struct root_lookup *root_lookup)
ri = (struct btrfs_root_item *)(args.buf + off);
gen = btrfs_stack_root_generation(ri);
- flags = btrfs_root_flags(ri);
+ flags = btrfs_stack_root_flags(ri);
if(sh.len >
sizeof(struct btrfs_root_item_v0)) {
otime = btrfs_stack_timespec_sec(&ri->otime);
diff --git a/ctree.h b/ctree.h
index 9b96268a..bd0374d3 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2058,7 +2058,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_root_level, struct btrfs_root_item, level, 8);
BTRFS_SETGET_STACK_FUNCS(stack_root_dirid, struct btrfs_root_item, root_dirid,
64);
BTRFS_SETGET_STACK_FUNCS(stack_root_refs, struct btrfs_root_item, refs, 32);
-BTRFS_SETGET_STACK_FUNCS(root_flags, struct btrfs_root_item, flags, 64);
+BTRFS_SETGET_STACK_FUNCS(stack_root_flags, struct btrfs_root_item, flags, 64);
BTRFS_SETGET_STACK_FUNCS(root_used, struct btrfs_root_item, bytes_used, 64);
BTRFS_SETGET_STACK_FUNCS(root_limit, struct btrfs_root_item, byte_limit, 64);
BTRFS_SETGET_STACK_FUNCS(root_last_snapshot, struct btrfs_root_item,
diff --git a/print-tree.c b/print-tree.c
index 8c53bb85..f82b3ec7 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -585,7 +585,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
memset(&root_item, 0, sizeof(root_item));
read_extent_buffer(leaf, &root_item, (unsigned long)ri, len);
- root_flags_to_str(btrfs_root_flags(&root_item), flags_str);
+ root_flags_to_str(btrfs_stack_root_flags(&root_item), flags_str);
printf("\t\tgeneration %llu root_dirid %llu bytenr %llu level %hhu refs %u\n",
(unsigned long long)btrfs_stack_root_generation(&root_item),
@@ -597,7 +597,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
(unsigned long long)btrfs_root_last_snapshot(&root_item),
(unsigned long long)btrfs_root_limit(&root_item),
(unsigned long long)btrfs_root_used(&root_item),
- (unsigned long long)btrfs_root_flags(&root_item),
+ (unsigned long long)btrfs_stack_root_flags(&root_item),
flags_str);
if (root_item.generation == root_item.generation_v2) {
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 13/67] btrfs-progs: add the stack prefix for root_used set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (11 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 12/67] btrfs-progs: add the stack prefix for root_flags " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 14/67] btrfs-progs: add the stack prefix for root_limit " Lu Fengqi
` (54 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The root_used set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
convert/common.c | 2 +-
ctree.h | 3 ++-
extent-tree.c | 4 ++--
mkfs/common.c | 2 +-
print-tree.c | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/convert/common.c b/convert/common.c
index 304ee6ed..9a386932 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -193,7 +193,7 @@ static void insert_temp_root_item(struct extent_buffer *buf,
btrfs_set_stack_inode_nbytes(inode_item, cfg->nodesize);
btrfs_set_stack_inode_mode(inode_item, S_IFDIR | 0755);
btrfs_set_stack_root_refs(&root_item, 1);
- btrfs_set_root_used(&root_item, cfg->nodesize);
+ btrfs_set_stack_root_used(&root_item, cfg->nodesize);
btrfs_set_stack_root_generation(&root_item, 1);
btrfs_set_stack_root_bytenr(&root_item, bytenr);
diff --git a/ctree.h b/ctree.h
index bd0374d3..a49f9dda 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2059,7 +2059,8 @@ BTRFS_SETGET_STACK_FUNCS(stack_root_dirid, struct btrfs_root_item, root_dirid,
64);
BTRFS_SETGET_STACK_FUNCS(stack_root_refs, struct btrfs_root_item, refs, 32);
BTRFS_SETGET_STACK_FUNCS(stack_root_flags, struct btrfs_root_item, flags, 64);
-BTRFS_SETGET_STACK_FUNCS(root_used, struct btrfs_root_item, bytes_used, 64);
+BTRFS_SETGET_STACK_FUNCS(stack_root_used, struct btrfs_root_item, bytes_used,
+ 64);
BTRFS_SETGET_STACK_FUNCS(root_limit, struct btrfs_root_item, byte_limit, 64);
BTRFS_SETGET_STACK_FUNCS(root_last_snapshot, struct btrfs_root_item,
last_snapshot, 64);
diff --git a/extent-tree.c b/extent-tree.c
index 9ca0339e..a3e4bd1a 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -1943,12 +1943,12 @@ static int update_block_group(struct btrfs_trans_handle *trans,
btrfs_set_super_bytes_used(info->super_copy, old_val);
/* block accounting for root item */
- old_val = btrfs_root_used(&root->root_item);
+ old_val = btrfs_stack_root_used(&root->root_item);
if (alloc)
old_val += num_bytes;
else
old_val -= num_bytes;
- btrfs_set_root_used(&root->root_item, old_val);
+ btrfs_set_stack_root_used(&root->root_item, old_val);
while(total) {
cache = btrfs_lookup_block_group(info, bytenr);
diff --git a/mkfs/common.c b/mkfs/common.c
index 82859503..0b3e8173 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -58,7 +58,7 @@ static int btrfs_create_tree_root(int fd, struct btrfs_mkfs_config *cfg,
btrfs_set_stack_inode_nbytes(inode_item, cfg->nodesize);
btrfs_set_stack_inode_mode(inode_item, S_IFDIR | 0755);
btrfs_set_stack_root_refs(&root_item, 1);
- btrfs_set_root_used(&root_item, cfg->nodesize);
+ btrfs_set_stack_root_used(&root_item, cfg->nodesize);
btrfs_set_stack_root_generation(&root_item, 1);
btrfs_set_stack_disk_key_type(&disk_key, BTRFS_ROOT_ITEM_KEY);
diff --git a/print-tree.c b/print-tree.c
index f82b3ec7..c2d19f38 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -596,7 +596,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
printf("\t\tlastsnap %llu byte_limit %llu bytes_used %llu flags 0x%llx(%s)\n",
(unsigned long long)btrfs_root_last_snapshot(&root_item),
(unsigned long long)btrfs_root_limit(&root_item),
- (unsigned long long)btrfs_root_used(&root_item),
+ (unsigned long long)btrfs_stack_root_used(&root_item),
(unsigned long long)btrfs_stack_root_flags(&root_item),
flags_str);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 14/67] btrfs-progs: add the stack prefix for root_limit set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (12 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 13/67] btrfs-progs: add the stack prefix for root_used " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 15/67] btrfs-progs: add the stack prefix for root_last_snapshot " Lu Fengqi
` (53 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The root_limit set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
ctree.h | 3 ++-
print-tree.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ctree.h b/ctree.h
index a49f9dda..7c72b5d6 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2061,7 +2061,8 @@ BTRFS_SETGET_STACK_FUNCS(stack_root_refs, struct btrfs_root_item, refs, 32);
BTRFS_SETGET_STACK_FUNCS(stack_root_flags, struct btrfs_root_item, flags, 64);
BTRFS_SETGET_STACK_FUNCS(stack_root_used, struct btrfs_root_item, bytes_used,
64);
-BTRFS_SETGET_STACK_FUNCS(root_limit, struct btrfs_root_item, byte_limit, 64);
+BTRFS_SETGET_STACK_FUNCS(stack_root_limit, struct btrfs_root_item, byte_limit,
+ 64);
BTRFS_SETGET_STACK_FUNCS(root_last_snapshot, struct btrfs_root_item,
last_snapshot, 64);
BTRFS_SETGET_STACK_FUNCS(root_generation_v2, struct btrfs_root_item,
diff --git a/print-tree.c b/print-tree.c
index c2d19f38..fb9b0412 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -595,7 +595,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
btrfs_stack_root_refs(&root_item));
printf("\t\tlastsnap %llu byte_limit %llu bytes_used %llu flags 0x%llx(%s)\n",
(unsigned long long)btrfs_root_last_snapshot(&root_item),
- (unsigned long long)btrfs_root_limit(&root_item),
+ (unsigned long long)btrfs_stack_root_limit(&root_item),
(unsigned long long)btrfs_stack_root_used(&root_item),
(unsigned long long)btrfs_stack_root_flags(&root_item),
flags_str);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 15/67] btrfs-progs: add the stack prefix for root_last_snapshot set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (13 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 14/67] btrfs-progs: add the stack prefix for root_limit " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 16/67] btrfs-progs: add the stack prefix for root_generation_v2 " Lu Fengqi
` (52 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The root_last_snapshot set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-check.c | 2 +-
ctree.c | 2 +-
ctree.h | 2 +-
print-tree.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmds-check.c b/cmds-check.c
index b79e9f6c..6070e8d5 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -11538,7 +11538,7 @@ again:
offset = btrfs_item_ptr_offset(leaf, path.slots[0]);
read_extent_buffer(leaf, &ri, offset, sizeof(ri));
- last_snapshot = btrfs_root_last_snapshot(&ri);
+ last_snapshot = btrfs_stack_root_last_snapshot(&ri);
if (btrfs_stack_disk_key_objectid(&ri.drop_progress)
== 0) {
level = btrfs_stack_root_level(&ri);
diff --git a/ctree.c b/ctree.c
index 86df6bd9..7a55f6ac 100644
--- a/ctree.c
+++ b/ctree.c
@@ -151,7 +151,7 @@ static int btrfs_block_can_be_shared(struct btrfs_root *root,
if (root->ref_cows &&
buf != root->node && buf != root->commit_root &&
(btrfs_header_generation(buf) <=
- btrfs_root_last_snapshot(&root->root_item) ||
+ btrfs_stack_root_last_snapshot(&root->root_item) ||
btrfs_header_flag(buf, BTRFS_HEADER_FLAG_RELOC)))
return 1;
#ifdef BTRFS_COMPAT_EXTENT_TREE_V0
diff --git a/ctree.h b/ctree.h
index 7c72b5d6..b5379d3b 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2063,7 +2063,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_root_used, struct btrfs_root_item, bytes_used,
64);
BTRFS_SETGET_STACK_FUNCS(stack_root_limit, struct btrfs_root_item, byte_limit,
64);
-BTRFS_SETGET_STACK_FUNCS(root_last_snapshot, struct btrfs_root_item,
+BTRFS_SETGET_STACK_FUNCS(stack_root_last_snapshot, struct btrfs_root_item,
last_snapshot, 64);
BTRFS_SETGET_STACK_FUNCS(root_generation_v2, struct btrfs_root_item,
generation_v2, 64);
diff --git a/print-tree.c b/print-tree.c
index fb9b0412..7315a8bf 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -594,7 +594,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
btrfs_stack_root_level(&root_item),
btrfs_stack_root_refs(&root_item));
printf("\t\tlastsnap %llu byte_limit %llu bytes_used %llu flags 0x%llx(%s)\n",
- (unsigned long long)btrfs_root_last_snapshot(&root_item),
+ (unsigned long long)btrfs_stack_root_last_snapshot(&root_item),
(unsigned long long)btrfs_stack_root_limit(&root_item),
(unsigned long long)btrfs_stack_root_used(&root_item),
(unsigned long long)btrfs_stack_root_flags(&root_item),
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 16/67] btrfs-progs: add the stack prefix for root_generation_v2 set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (14 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 15/67] btrfs-progs: add the stack prefix for root_last_snapshot " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 17/67] btrfs-progs: add the stack prefix for root_ctransid " Lu Fengqi
` (51 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The root_generation_v2 set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
ctree.h | 2 +-
root-tree.c | 6 ++++--
send-utils.c | 3 ++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ctree.h b/ctree.h
index b5379d3b..ab06e66a 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2065,7 +2065,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_root_limit, struct btrfs_root_item, byte_limit,
64);
BTRFS_SETGET_STACK_FUNCS(stack_root_last_snapshot, struct btrfs_root_item,
last_snapshot, 64);
-BTRFS_SETGET_STACK_FUNCS(root_generation_v2, struct btrfs_root_item,
+BTRFS_SETGET_STACK_FUNCS(stack_root_generation_v2, struct btrfs_root_item,
generation_v2, 64);
BTRFS_SETGET_STACK_FUNCS(root_ctransid, struct btrfs_root_item,
ctransid, 64);
diff --git a/root-tree.c b/root-tree.c
index 2de63f6c..d6c4bd62 100644
--- a/root-tree.c
+++ b/root-tree.c
@@ -121,7 +121,8 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
* Update generation_v2 so at the next mount we know the new root
* fields are valid.
*/
- btrfs_set_root_generation_v2(item, btrfs_stack_root_generation(item));
+ btrfs_set_stack_root_generation_v2(item,
+ btrfs_stack_root_generation(item));
write_extent_buffer(l, item, ptr, sizeof(*item));
btrfs_mark_buffer_dirty(path->nodes[0]);
@@ -139,7 +140,8 @@ int btrfs_insert_root(struct btrfs_trans_handle *trans, struct btrfs_root
/*
* Make sure generation v1 and v2 match. See update_root for details.
*/
- btrfs_set_root_generation_v2(item, btrfs_stack_root_generation(item));
+ btrfs_set_stack_root_generation_v2(item,
+ btrfs_stack_root_generation(item));
ret = btrfs_insert_item(trans, root, key, item, sizeof(*item));
return ret;
}
diff --git a/send-utils.c b/send-utils.c
index 3da6b9c7..7273d4ed 100644
--- a/send-utils.c
+++ b/send-utils.c
@@ -153,7 +153,8 @@ static int btrfs_read_root_item(int mnt_fd, u64 root_id,
return ret;
if (read_len < sizeof(*item) ||
- btrfs_stack_root_generation(item) != btrfs_root_generation_v2(item))
+ btrfs_stack_root_generation(item) !=
+ btrfs_stack_root_generation_v2(item))
memset(&item->generation_v2, 0,
sizeof(*item) - offsetof(struct btrfs_root_item,
generation_v2));
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 17/67] btrfs-progs: add the stack prefix for root_ctransid set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (15 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 16/67] btrfs-progs: add the stack prefix for root_generation_v2 " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 18/67] btrfs-progs: add the stack prefix for root_otransid " Lu Fengqi
` (50 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The root_ctransid set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
ctree.h | 2 +-
print-tree.c | 2 +-
send-utils.c | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ctree.h b/ctree.h
index ab06e66a..6538bd23 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2067,7 +2067,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_root_last_snapshot, struct btrfs_root_item,
last_snapshot, 64);
BTRFS_SETGET_STACK_FUNCS(stack_root_generation_v2, struct btrfs_root_item,
generation_v2, 64);
-BTRFS_SETGET_STACK_FUNCS(root_ctransid, struct btrfs_root_item,
+BTRFS_SETGET_STACK_FUNCS(stack_root_ctransid, struct btrfs_root_item,
ctransid, 64);
BTRFS_SETGET_STACK_FUNCS(root_otransid, struct btrfs_root_item,
otransid, 64);
diff --git a/print-tree.c b/print-tree.c
index 7315a8bf..edffd6f2 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -613,7 +613,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
}
if (root_item.ctransid) {
printf("\t\tctransid %llu otransid %llu stransid %llu rtransid %llu\n",
- btrfs_root_ctransid(&root_item),
+ btrfs_stack_root_ctransid(&root_item),
btrfs_root_otransid(&root_item),
btrfs_root_stransid(&root_item),
btrfs_root_rtransid(&root_item));
diff --git a/send-utils.c b/send-utils.c
index 7273d4ed..c59e505b 100644
--- a/send-utils.c
+++ b/send-utils.c
@@ -496,7 +496,7 @@ struct subvol_info *subvol_uuid_search2(struct subvol_uuid_search *s,
memcpy(info->uuid, root_item.uuid, BTRFS_UUID_SIZE);
memcpy(info->received_uuid, root_item.received_uuid, BTRFS_UUID_SIZE);
memcpy(info->parent_uuid, root_item.parent_uuid, BTRFS_UUID_SIZE);
- info->ctransid = btrfs_root_ctransid(&root_item);
+ info->ctransid = btrfs_stack_root_ctransid(&root_item);
info->otransid = btrfs_root_otransid(&root_item);
info->stransid = btrfs_root_stransid(&root_item);
info->rtransid = btrfs_root_rtransid(&root_item);
@@ -672,7 +672,8 @@ int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s)
memcpy(si->received_uuid,
root_item.received_uuid,
BTRFS_UUID_SIZE);
- si->ctransid = btrfs_root_ctransid(&root_item);
+ si->ctransid = btrfs_stack_root_ctransid(
+ &root_item);
si->otransid = btrfs_root_otransid(&root_item);
si->stransid = btrfs_root_stransid(&root_item);
si->rtransid = btrfs_root_rtransid(&root_item);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 18/67] btrfs-progs: add the stack prefix for root_otransid set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (16 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 17/67] btrfs-progs: add the stack prefix for root_ctransid " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 19/67] btrfs-progs: add the stack prefix for root_stransid " Lu Fengqi
` (49 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The root_otransid set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfs-list.c | 2 +-
ctree.h | 2 +-
print-tree.c | 2 +-
send-utils.c | 5 +++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/btrfs-list.c b/btrfs-list.c
index 85e34116..4a0db259 100644
--- a/btrfs-list.c
+++ b/btrfs-list.c
@@ -1028,7 +1028,7 @@ static int list_subvol_search(int fd, struct root_lookup *root_lookup)
if(sh.len >
sizeof(struct btrfs_root_item_v0)) {
otime = btrfs_stack_timespec_sec(&ri->otime);
- ogen = btrfs_root_otransid(ri);
+ ogen = btrfs_stack_root_otransid(ri);
memcpy(uuid, ri->uuid, BTRFS_UUID_SIZE);
memcpy(puuid, ri->parent_uuid, BTRFS_UUID_SIZE);
memcpy(ruuid, ri->received_uuid, BTRFS_UUID_SIZE);
diff --git a/ctree.h b/ctree.h
index 6538bd23..9dad4928 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2069,7 +2069,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_root_generation_v2, struct btrfs_root_item,
generation_v2, 64);
BTRFS_SETGET_STACK_FUNCS(stack_root_ctransid, struct btrfs_root_item,
ctransid, 64);
-BTRFS_SETGET_STACK_FUNCS(root_otransid, struct btrfs_root_item,
+BTRFS_SETGET_STACK_FUNCS(stack_root_otransid, struct btrfs_root_item,
otransid, 64);
BTRFS_SETGET_STACK_FUNCS(root_stransid, struct btrfs_root_item,
stransid, 64);
diff --git a/print-tree.c b/print-tree.c
index edffd6f2..20d74774 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -614,7 +614,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
if (root_item.ctransid) {
printf("\t\tctransid %llu otransid %llu stransid %llu rtransid %llu\n",
btrfs_stack_root_ctransid(&root_item),
- btrfs_root_otransid(&root_item),
+ btrfs_stack_root_otransid(&root_item),
btrfs_root_stransid(&root_item),
btrfs_root_rtransid(&root_item));
}
diff --git a/send-utils.c b/send-utils.c
index c59e505b..1317030a 100644
--- a/send-utils.c
+++ b/send-utils.c
@@ -497,7 +497,7 @@ struct subvol_info *subvol_uuid_search2(struct subvol_uuid_search *s,
memcpy(info->received_uuid, root_item.received_uuid, BTRFS_UUID_SIZE);
memcpy(info->parent_uuid, root_item.parent_uuid, BTRFS_UUID_SIZE);
info->ctransid = btrfs_stack_root_ctransid(&root_item);
- info->otransid = btrfs_root_otransid(&root_item);
+ info->otransid = btrfs_stack_root_otransid(&root_item);
info->stransid = btrfs_root_stransid(&root_item);
info->rtransid = btrfs_root_rtransid(&root_item);
if (type == subvol_search_by_path) {
@@ -674,7 +674,8 @@ int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s)
BTRFS_UUID_SIZE);
si->ctransid = btrfs_stack_root_ctransid(
&root_item);
- si->otransid = btrfs_root_otransid(&root_item);
+ si->otransid = btrfs_stack_root_otransid(
+ &root_item);
si->stransid = btrfs_root_stransid(&root_item);
si->rtransid = btrfs_root_rtransid(&root_item);
si->path = path;
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 19/67] btrfs-progs: add the stack prefix for root_stransid set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (17 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 18/67] btrfs-progs: add the stack prefix for root_otransid " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 20/67] btrfs-progs: add the stack prefix for root_rtransid " Lu Fengqi
` (48 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The root_stransid set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
ctree.h | 2 +-
print-tree.c | 2 +-
send-utils.c | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ctree.h b/ctree.h
index 9dad4928..bce1b0d4 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2071,7 +2071,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_root_ctransid, struct btrfs_root_item,
ctransid, 64);
BTRFS_SETGET_STACK_FUNCS(stack_root_otransid, struct btrfs_root_item,
otransid, 64);
-BTRFS_SETGET_STACK_FUNCS(root_stransid, struct btrfs_root_item,
+BTRFS_SETGET_STACK_FUNCS(stack_root_stransid, struct btrfs_root_item,
stransid, 64);
BTRFS_SETGET_STACK_FUNCS(root_rtransid, struct btrfs_root_item,
rtransid, 64);
diff --git a/print-tree.c b/print-tree.c
index 20d74774..6ab7c76c 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -615,7 +615,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
printf("\t\tctransid %llu otransid %llu stransid %llu rtransid %llu\n",
btrfs_stack_root_ctransid(&root_item),
btrfs_stack_root_otransid(&root_item),
- btrfs_root_stransid(&root_item),
+ btrfs_stack_root_stransid(&root_item),
btrfs_root_rtransid(&root_item));
}
if (btrfs_timespec_sec(leaf, btrfs_root_ctime(ri)))
diff --git a/send-utils.c b/send-utils.c
index 1317030a..8d0fdca4 100644
--- a/send-utils.c
+++ b/send-utils.c
@@ -498,7 +498,7 @@ struct subvol_info *subvol_uuid_search2(struct subvol_uuid_search *s,
memcpy(info->parent_uuid, root_item.parent_uuid, BTRFS_UUID_SIZE);
info->ctransid = btrfs_stack_root_ctransid(&root_item);
info->otransid = btrfs_stack_root_otransid(&root_item);
- info->stransid = btrfs_root_stransid(&root_item);
+ info->stransid = btrfs_stack_root_stransid(&root_item);
info->rtransid = btrfs_root_rtransid(&root_item);
if (type == subvol_search_by_path) {
info->path = strdup(path);
@@ -676,7 +676,8 @@ int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s)
&root_item);
si->otransid = btrfs_stack_root_otransid(
&root_item);
- si->stransid = btrfs_root_stransid(&root_item);
+ si->stransid = btrfs_stack_root_stransid(
+ &root_item);
si->rtransid = btrfs_root_rtransid(&root_item);
si->path = path;
subvol_uuid_search_add(s, si);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 20/67] btrfs-progs: add the stack prefix for root_rtransid set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (18 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 19/67] btrfs-progs: add the stack prefix for root_stransid " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 21/67] btrfs-progs: add the stack prefix for backup_tree_root " Lu Fengqi
` (47 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The root_rtransid set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
ctree.h | 2 +-
print-tree.c | 2 +-
send-utils.c | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ctree.h b/ctree.h
index bce1b0d4..fa05adea 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2073,7 +2073,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_root_otransid, struct btrfs_root_item,
otransid, 64);
BTRFS_SETGET_STACK_FUNCS(stack_root_stransid, struct btrfs_root_item,
stransid, 64);
-BTRFS_SETGET_STACK_FUNCS(root_rtransid, struct btrfs_root_item,
+BTRFS_SETGET_STACK_FUNCS(stack_root_rtransid, struct btrfs_root_item,
rtransid, 64);
static inline struct btrfs_timespec* btrfs_root_ctime(
diff --git a/print-tree.c b/print-tree.c
index 6ab7c76c..e91f11a1 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -616,7 +616,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
btrfs_stack_root_ctransid(&root_item),
btrfs_stack_root_otransid(&root_item),
btrfs_stack_root_stransid(&root_item),
- btrfs_root_rtransid(&root_item));
+ btrfs_stack_root_rtransid(&root_item));
}
if (btrfs_timespec_sec(leaf, btrfs_root_ctime(ri)))
print_timespec(leaf, btrfs_root_ctime(ri),
diff --git a/send-utils.c b/send-utils.c
index 8d0fdca4..db84c9d5 100644
--- a/send-utils.c
+++ b/send-utils.c
@@ -499,7 +499,7 @@ struct subvol_info *subvol_uuid_search2(struct subvol_uuid_search *s,
info->ctransid = btrfs_stack_root_ctransid(&root_item);
info->otransid = btrfs_stack_root_otransid(&root_item);
info->stransid = btrfs_stack_root_stransid(&root_item);
- info->rtransid = btrfs_root_rtransid(&root_item);
+ info->rtransid = btrfs_stack_root_rtransid(&root_item);
if (type == subvol_search_by_path) {
info->path = strdup(path);
if (!info->path) {
@@ -678,7 +678,8 @@ int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s)
&root_item);
si->stransid = btrfs_stack_root_stransid(
&root_item);
- si->rtransid = btrfs_root_rtransid(&root_item);
+ si->rtransid = btrfs_stack_root_rtransid(
+ &root_item);
si->path = path;
subvol_uuid_search_add(s, si);
root_item_valid = 0;
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 21/67] btrfs-progs: add the stack prefix for backup_tree_root set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (19 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 20/67] btrfs-progs: add the stack prefix for root_rtransid " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 22/67] btrfs-progs: add the stack prefix for backup_tree_root_gen " Lu Fengqi
` (46 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The backup_tree_root set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 4 ++--
ctree.h | 2 +-
disk-io.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 23a71155..a9962ee3 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -153,7 +153,7 @@ static int empty_backup(struct btrfs_root_backup *backup)
static void print_root_backup(struct btrfs_root_backup *backup)
{
printf("\t\tbackup_tree_root:\t%llu\tgen: %llu\tlevel: %d\n",
- btrfs_backup_tree_root(backup),
+ btrfs_stack_backup_tree_root(backup),
btrfs_backup_tree_root_gen(backup),
btrfs_backup_tree_root_level(backup));
printf("\t\tbackup_chunk_root:\t%llu\tgen: %llu\tlevel: %d\n",
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 66e7227d..bb94ae8f 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -87,8 +87,8 @@ static void print_old_roots(struct btrfs_super_block *super)
backup = super->super_roots + i;
printf("btrfs root backup slot %d\n", i);
printf("\ttree root gen %llu block %llu\n",
- (unsigned long long)btrfs_backup_tree_root_gen(backup),
- (unsigned long long)btrfs_backup_tree_root(backup));
+ (unsigned long long)btrfs_backup_tree_root_gen(backup),
+ (unsigned long long)btrfs_stack_backup_tree_root(backup));
printf("\t\textent root gen %llu block %llu\n",
(unsigned long long)btrfs_backup_extent_root_gen(backup),
diff --git a/ctree.h b/ctree.h
index fa05adea..189c1b0c 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2109,7 +2109,7 @@ static inline struct btrfs_timespec* btrfs_root_rtime(
}
/* struct btrfs_root_backup */
-BTRFS_SETGET_STACK_FUNCS(backup_tree_root, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_tree_root, struct btrfs_root_backup,
tree_root, 64);
BTRFS_SETGET_STACK_FUNCS(backup_tree_root_gen, struct btrfs_root_backup,
tree_root_gen, 64);
diff --git a/disk-io.c b/disk-io.c
index 6f9258d2..8d226e38 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -859,7 +859,7 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info, u64 root_tree_bytenr,
return -EIO;
}
backup = fs_info->super_copy->super_roots + index;
- root_tree_bytenr = btrfs_backup_tree_root(backup);
+ root_tree_bytenr = btrfs_stack_backup_tree_root(backup);
generation = btrfs_backup_tree_root_gen(backup);
}
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 22/67] btrfs-progs: add the stack prefix for backup_tree_root_gen set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (20 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 21/67] btrfs-progs: add the stack prefix for backup_tree_root " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 23/67] btrfs-progs: add the stack prefix for backup_tree_root_level " Lu Fengqi
` (45 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The backup_tree_root_gen set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 2 +-
ctree.h | 2 +-
disk-io.c | 8 ++++----
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index a9962ee3..69b4da4e 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -154,7 +154,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
{
printf("\t\tbackup_tree_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_stack_backup_tree_root(backup),
- btrfs_backup_tree_root_gen(backup),
+ btrfs_stack_backup_tree_root_gen(backup),
btrfs_backup_tree_root_level(backup));
printf("\t\tbackup_chunk_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_backup_chunk_root(backup),
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index bb94ae8f..326c8f90 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -87,7 +87,7 @@ static void print_old_roots(struct btrfs_super_block *super)
backup = super->super_roots + i;
printf("btrfs root backup slot %d\n", i);
printf("\ttree root gen %llu block %llu\n",
- (unsigned long long)btrfs_backup_tree_root_gen(backup),
+ (unsigned long long)btrfs_stack_backup_tree_root_gen(backup),
(unsigned long long)btrfs_stack_backup_tree_root(backup));
printf("\t\textent root gen %llu block %llu\n",
diff --git a/ctree.h b/ctree.h
index 189c1b0c..7acc7620 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2111,7 +2111,7 @@ static inline struct btrfs_timespec* btrfs_root_rtime(
/* struct btrfs_root_backup */
BTRFS_SETGET_STACK_FUNCS(stack_backup_tree_root, struct btrfs_root_backup,
tree_root, 64);
-BTRFS_SETGET_STACK_FUNCS(backup_tree_root_gen, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_tree_root_gen, struct btrfs_root_backup,
tree_root_gen, 64);
BTRFS_SETGET_STACK_FUNCS(backup_tree_root_level, struct btrfs_root_backup,
tree_root_level, 8);
diff --git a/disk-io.c b/disk-io.c
index 8d226e38..ef147a40 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -800,10 +800,10 @@ static int find_best_backup_root(struct btrfs_super_block *super)
for (i = 0; i < BTRFS_NUM_BACKUP_ROOTS; i++) {
backup = super->super_roots + i;
- if (btrfs_backup_tree_root_gen(backup) != orig_gen &&
- btrfs_backup_tree_root_gen(backup) > gen) {
+ if (btrfs_stack_backup_tree_root_gen(backup) != orig_gen &&
+ btrfs_stack_backup_tree_root_gen(backup) > gen) {
best_index = i;
- gen = btrfs_backup_tree_root_gen(backup);
+ gen = btrfs_stack_backup_tree_root_gen(backup);
}
}
return best_index;
@@ -860,7 +860,7 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info, u64 root_tree_bytenr,
}
backup = fs_info->super_copy->super_roots + index;
root_tree_bytenr = btrfs_stack_backup_tree_root(backup);
- generation = btrfs_backup_tree_root_gen(backup);
+ generation = btrfs_stack_backup_tree_root_gen(backup);
}
root->node = read_tree_block(fs_info, root_tree_bytenr, generation);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 23/67] btrfs-progs: add the stack prefix for backup_tree_root_level set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (21 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 22/67] btrfs-progs: add the stack prefix for backup_tree_root_gen " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 24/67] btrfs-progs: add the stack prefix for backup_chunk_root " Lu Fengqi
` (44 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The backup_tree_root_level set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
ctree.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 69b4da4e..68df8a0c 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -155,7 +155,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
printf("\t\tbackup_tree_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_stack_backup_tree_root(backup),
btrfs_stack_backup_tree_root_gen(backup),
- btrfs_backup_tree_root_level(backup));
+ btrfs_stack_backup_tree_root_level(backup));
printf("\t\tbackup_chunk_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_backup_chunk_root(backup),
btrfs_backup_chunk_root_gen(backup),
diff --git a/ctree.h b/ctree.h
index 7acc7620..0f0ee0cb 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2113,7 +2113,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_tree_root, struct btrfs_root_backup,
tree_root, 64);
BTRFS_SETGET_STACK_FUNCS(stack_backup_tree_root_gen, struct btrfs_root_backup,
tree_root_gen, 64);
-BTRFS_SETGET_STACK_FUNCS(backup_tree_root_level, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_tree_root_level, struct btrfs_root_backup,
tree_root_level, 8);
BTRFS_SETGET_STACK_FUNCS(backup_chunk_root, struct btrfs_root_backup,
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 24/67] btrfs-progs: add the stack prefix for backup_chunk_root set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (22 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 23/67] btrfs-progs: add the stack prefix for backup_tree_root_level " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 25/67] btrfs-progs: add the stack prefix for backup_chunk_root_gen " Lu Fengqi
` (43 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The backup_chunk_root set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 4 ++--
ctree.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 68df8a0c..3def819e 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -157,7 +157,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
btrfs_stack_backup_tree_root_gen(backup),
btrfs_stack_backup_tree_root_level(backup));
printf("\t\tbackup_chunk_root:\t%llu\tgen: %llu\tlevel: %d\n",
- btrfs_backup_chunk_root(backup),
+ btrfs_stack_backup_chunk_root(backup),
btrfs_backup_chunk_root_gen(backup),
btrfs_backup_chunk_root_level(backup));
printf("\t\tbackup_extent_root:\t%llu\tgen: %llu\tlevel: %d\n",
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 326c8f90..7fc13621 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -95,8 +95,8 @@ static void print_old_roots(struct btrfs_super_block *super)
(unsigned long long)btrfs_backup_extent_root(backup));
printf("\t\tchunk root gen %llu block %llu\n",
- (unsigned long long)btrfs_backup_chunk_root_gen(backup),
- (unsigned long long)btrfs_backup_chunk_root(backup));
+ (unsigned long long)btrfs_backup_chunk_root_gen(backup),
+ (unsigned long long)btrfs_stack_backup_chunk_root(backup));
printf("\t\tdevice root gen %llu block %llu\n",
(unsigned long long)btrfs_backup_dev_root_gen(backup),
diff --git a/ctree.h b/ctree.h
index 0f0ee0cb..69bf40e5 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2116,7 +2116,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_tree_root_gen, struct btrfs_root_backup,
BTRFS_SETGET_STACK_FUNCS(stack_backup_tree_root_level, struct btrfs_root_backup,
tree_root_level, 8);
-BTRFS_SETGET_STACK_FUNCS(backup_chunk_root, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_chunk_root, struct btrfs_root_backup,
chunk_root, 64);
BTRFS_SETGET_STACK_FUNCS(backup_chunk_root_gen, struct btrfs_root_backup,
chunk_root_gen, 64);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 25/67] btrfs-progs: add the stack prefix for backup_chunk_root_gen set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (23 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 24/67] btrfs-progs: add the stack prefix for backup_chunk_root " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 26/67] btrfs-progs: add the stack prefix for backup_chunk_root_level " Lu Fengqi
` (42 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The backup_chunk_root_gen set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 2 +-
ctree.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 3def819e..d399ce5e 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -158,7 +158,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
btrfs_stack_backup_tree_root_level(backup));
printf("\t\tbackup_chunk_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_stack_backup_chunk_root(backup),
- btrfs_backup_chunk_root_gen(backup),
+ btrfs_stack_backup_chunk_root_gen(backup),
btrfs_backup_chunk_root_level(backup));
printf("\t\tbackup_extent_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_backup_extent_root(backup),
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 7fc13621..0788d535 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -95,7 +95,7 @@ static void print_old_roots(struct btrfs_super_block *super)
(unsigned long long)btrfs_backup_extent_root(backup));
printf("\t\tchunk root gen %llu block %llu\n",
- (unsigned long long)btrfs_backup_chunk_root_gen(backup),
+ (unsigned long long)btrfs_stack_backup_chunk_root_gen(backup),
(unsigned long long)btrfs_stack_backup_chunk_root(backup));
printf("\t\tdevice root gen %llu block %llu\n",
diff --git a/ctree.h b/ctree.h
index 69bf40e5..36514f02 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2118,7 +2118,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_tree_root_level, struct btrfs_root_backup,
BTRFS_SETGET_STACK_FUNCS(stack_backup_chunk_root, struct btrfs_root_backup,
chunk_root, 64);
-BTRFS_SETGET_STACK_FUNCS(backup_chunk_root_gen, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_chunk_root_gen, struct btrfs_root_backup,
chunk_root_gen, 64);
BTRFS_SETGET_STACK_FUNCS(backup_chunk_root_level, struct btrfs_root_backup,
chunk_root_level, 8);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 26/67] btrfs-progs: add the stack prefix for backup_chunk_root_level set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (24 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 25/67] btrfs-progs: add the stack prefix for backup_chunk_root_gen " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:08 ` [PATCH 27/67] btrfs-progs: add the stack prefix for backup_extent_root " Lu Fengqi
` (41 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The backup_chunk_root_level set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
ctree.h | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index d399ce5e..bf7530a3 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -159,7 +159,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
printf("\t\tbackup_chunk_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_stack_backup_chunk_root(backup),
btrfs_stack_backup_chunk_root_gen(backup),
- btrfs_backup_chunk_root_level(backup));
+ btrfs_stack_backup_chunk_root_level(backup));
printf("\t\tbackup_extent_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_backup_extent_root(backup),
btrfs_backup_extent_root_gen(backup),
diff --git a/ctree.h b/ctree.h
index 36514f02..1d481c29 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2120,7 +2120,8 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_chunk_root, struct btrfs_root_backup,
chunk_root, 64);
BTRFS_SETGET_STACK_FUNCS(stack_backup_chunk_root_gen, struct btrfs_root_backup,
chunk_root_gen, 64);
-BTRFS_SETGET_STACK_FUNCS(backup_chunk_root_level, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_chunk_root_level,
+ struct btrfs_root_backup,
chunk_root_level, 8);
BTRFS_SETGET_STACK_FUNCS(backup_extent_root, struct btrfs_root_backup,
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 27/67] btrfs-progs: add the stack prefix for backup_extent_root set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (25 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 26/67] btrfs-progs: add the stack prefix for backup_chunk_root_level " Lu Fengqi
@ 2018-01-11 5:08 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 28/67] btrfs-progs: add the stack prefix for backup_extent_root_gen " Lu Fengqi
` (40 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:08 UTC (permalink / raw)
To: linux-btrfs
The backup_extent_root set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 4 ++--
ctree.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index bf7530a3..fc38cd72 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -161,7 +161,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
btrfs_stack_backup_chunk_root_gen(backup),
btrfs_stack_backup_chunk_root_level(backup));
printf("\t\tbackup_extent_root:\t%llu\tgen: %llu\tlevel: %d\n",
- btrfs_backup_extent_root(backup),
+ btrfs_stack_backup_extent_root(backup),
btrfs_backup_extent_root_gen(backup),
btrfs_backup_extent_root_level(backup));
printf("\t\tbackup_fs_root:\t\t%llu\tgen: %llu\tlevel: %d\n",
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 0788d535..4fe401c8 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -91,8 +91,8 @@ static void print_old_roots(struct btrfs_super_block *super)
(unsigned long long)btrfs_stack_backup_tree_root(backup));
printf("\t\textent root gen %llu block %llu\n",
- (unsigned long long)btrfs_backup_extent_root_gen(backup),
- (unsigned long long)btrfs_backup_extent_root(backup));
+ (unsigned long long)btrfs_backup_extent_root_gen(backup),
+ (unsigned long long)btrfs_stack_backup_extent_root(backup));
printf("\t\tchunk root gen %llu block %llu\n",
(unsigned long long)btrfs_stack_backup_chunk_root_gen(backup),
diff --git a/ctree.h b/ctree.h
index 1d481c29..d5a18704 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2124,7 +2124,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_chunk_root_level,
struct btrfs_root_backup,
chunk_root_level, 8);
-BTRFS_SETGET_STACK_FUNCS(backup_extent_root, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_extent_root, struct btrfs_root_backup,
extent_root, 64);
BTRFS_SETGET_STACK_FUNCS(backup_extent_root_gen, struct btrfs_root_backup,
extent_root_gen, 64);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 28/67] btrfs-progs: add the stack prefix for backup_extent_root_gen set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (26 preceding siblings ...)
2018-01-11 5:08 ` [PATCH 27/67] btrfs-progs: add the stack prefix for backup_extent_root " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 29/67] btrfs-progs: add the stack prefix for backup_extent_root_level " Lu Fengqi
` (39 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The backup_extent_root_gen set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 2 +-
ctree.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index fc38cd72..d1c9c90d 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -162,7 +162,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
btrfs_stack_backup_chunk_root_level(backup));
printf("\t\tbackup_extent_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_stack_backup_extent_root(backup),
- btrfs_backup_extent_root_gen(backup),
+ btrfs_stack_backup_extent_root_gen(backup),
btrfs_backup_extent_root_level(backup));
printf("\t\tbackup_fs_root:\t\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_backup_fs_root(backup),
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 4fe401c8..d3634784 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -91,7 +91,7 @@ static void print_old_roots(struct btrfs_super_block *super)
(unsigned long long)btrfs_stack_backup_tree_root(backup));
printf("\t\textent root gen %llu block %llu\n",
- (unsigned long long)btrfs_backup_extent_root_gen(backup),
+ (unsigned long long)btrfs_stack_backup_extent_root_gen(backup),
(unsigned long long)btrfs_stack_backup_extent_root(backup));
printf("\t\tchunk root gen %llu block %llu\n",
diff --git a/ctree.h b/ctree.h
index d5a18704..b77a3f1e 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2126,7 +2126,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_chunk_root_level,
BTRFS_SETGET_STACK_FUNCS(stack_backup_extent_root, struct btrfs_root_backup,
extent_root, 64);
-BTRFS_SETGET_STACK_FUNCS(backup_extent_root_gen, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_extent_root_gen, struct btrfs_root_backup,
extent_root_gen, 64);
BTRFS_SETGET_STACK_FUNCS(backup_extent_root_level, struct btrfs_root_backup,
extent_root_level, 8);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 29/67] btrfs-progs: add the stack prefix for backup_extent_root_level set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (27 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 28/67] btrfs-progs: add the stack prefix for backup_extent_root_gen " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 30/67] btrfs-progs: add the stack prefix for backup_fs_root " Lu Fengqi
` (38 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The backup_extent_root_level set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
ctree.h | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index d1c9c90d..e7e2ada2 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -163,7 +163,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
printf("\t\tbackup_extent_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_stack_backup_extent_root(backup),
btrfs_stack_backup_extent_root_gen(backup),
- btrfs_backup_extent_root_level(backup));
+ btrfs_stack_backup_extent_root_level(backup));
printf("\t\tbackup_fs_root:\t\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_backup_fs_root(backup),
btrfs_backup_fs_root_gen(backup),
diff --git a/ctree.h b/ctree.h
index b77a3f1e..346c6a1f 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2128,7 +2128,8 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_extent_root, struct btrfs_root_backup,
extent_root, 64);
BTRFS_SETGET_STACK_FUNCS(stack_backup_extent_root_gen, struct btrfs_root_backup,
extent_root_gen, 64);
-BTRFS_SETGET_STACK_FUNCS(backup_extent_root_level, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_extent_root_level,
+ struct btrfs_root_backup,
extent_root_level, 8);
BTRFS_SETGET_STACK_FUNCS(backup_fs_root, struct btrfs_root_backup,
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 30/67] btrfs-progs: add the stack prefix for backup_fs_root set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (28 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 29/67] btrfs-progs: add the stack prefix for backup_extent_root_level " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 31/67] btrfs-progs: add the stack prefix for backup_fs_root_gen " Lu Fengqi
` (37 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The backup_fs_root set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 2 +-
ctree.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index e7e2ada2..624f0e91 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -165,7 +165,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
btrfs_stack_backup_extent_root_gen(backup),
btrfs_stack_backup_extent_root_level(backup));
printf("\t\tbackup_fs_root:\t\t%llu\tgen: %llu\tlevel: %d\n",
- btrfs_backup_fs_root(backup),
+ btrfs_stack_backup_fs_root(backup),
btrfs_backup_fs_root_gen(backup),
btrfs_backup_fs_root_level(backup));
printf("\t\tbackup_dev_root:\t%llu\tgen: %llu\tlevel: %d\n",
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index d3634784..38af67e0 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -108,7 +108,7 @@ static void print_old_roots(struct btrfs_super_block *super)
printf("\t\tfs root gen %llu block %llu\n",
(unsigned long long)btrfs_backup_fs_root_gen(backup),
- (unsigned long long)btrfs_backup_fs_root(backup));
+ (unsigned long long)btrfs_stack_backup_fs_root(backup));
printf("\t\t%llu used %llu total %llu devices\n",
(unsigned long long)btrfs_backup_bytes_used(backup),
diff --git a/ctree.h b/ctree.h
index 346c6a1f..ebd7c5b9 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2132,7 +2132,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_extent_root_level,
struct btrfs_root_backup,
extent_root_level, 8);
-BTRFS_SETGET_STACK_FUNCS(backup_fs_root, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_fs_root, struct btrfs_root_backup,
fs_root, 64);
BTRFS_SETGET_STACK_FUNCS(backup_fs_root_gen, struct btrfs_root_backup,
fs_root_gen, 64);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 31/67] btrfs-progs: add the stack prefix for backup_fs_root_gen set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (29 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 30/67] btrfs-progs: add the stack prefix for backup_fs_root " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 32/67] btrfs-progs: add the stack prefix for backup_fs_root_level " Lu Fengqi
` (36 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The backup_fs_root_gen set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 4 ++--
ctree.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 624f0e91..07fd8400 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -166,7 +166,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
btrfs_stack_backup_extent_root_level(backup));
printf("\t\tbackup_fs_root:\t\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_stack_backup_fs_root(backup),
- btrfs_backup_fs_root_gen(backup),
+ btrfs_stack_backup_fs_root_gen(backup),
btrfs_backup_fs_root_level(backup));
printf("\t\tbackup_dev_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_backup_dev_root(backup),
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 38af67e0..6ad9ed1d 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -107,8 +107,8 @@ static void print_old_roots(struct btrfs_super_block *super)
(unsigned long long)btrfs_backup_csum_root(backup));
printf("\t\tfs root gen %llu block %llu\n",
- (unsigned long long)btrfs_backup_fs_root_gen(backup),
- (unsigned long long)btrfs_stack_backup_fs_root(backup));
+ (unsigned long long)btrfs_stack_backup_fs_root_gen(backup),
+ (unsigned long long)btrfs_stack_backup_fs_root(backup));
printf("\t\t%llu used %llu total %llu devices\n",
(unsigned long long)btrfs_backup_bytes_used(backup),
diff --git a/ctree.h b/ctree.h
index ebd7c5b9..2253d340 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2134,7 +2134,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_extent_root_level,
BTRFS_SETGET_STACK_FUNCS(stack_backup_fs_root, struct btrfs_root_backup,
fs_root, 64);
-BTRFS_SETGET_STACK_FUNCS(backup_fs_root_gen, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_fs_root_gen, struct btrfs_root_backup,
fs_root_gen, 64);
BTRFS_SETGET_STACK_FUNCS(backup_fs_root_level, struct btrfs_root_backup,
fs_root_level, 8);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 32/67] btrfs-progs: add the stack prefix for backup_fs_root_level set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (30 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 31/67] btrfs-progs: add the stack prefix for backup_fs_root_gen " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 33/67] btrfs-progs: add the stack prefix for backup_dev_root " Lu Fengqi
` (35 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The backup_fs_root_level set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
ctree.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 07fd8400..15828ad2 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -167,7 +167,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
printf("\t\tbackup_fs_root:\t\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_stack_backup_fs_root(backup),
btrfs_stack_backup_fs_root_gen(backup),
- btrfs_backup_fs_root_level(backup));
+ btrfs_stack_backup_fs_root_level(backup));
printf("\t\tbackup_dev_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_backup_dev_root(backup),
btrfs_backup_dev_root_gen(backup),
diff --git a/ctree.h b/ctree.h
index 2253d340..62eecf7f 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2136,7 +2136,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_fs_root, struct btrfs_root_backup,
fs_root, 64);
BTRFS_SETGET_STACK_FUNCS(stack_backup_fs_root_gen, struct btrfs_root_backup,
fs_root_gen, 64);
-BTRFS_SETGET_STACK_FUNCS(backup_fs_root_level, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_fs_root_level, struct btrfs_root_backup,
fs_root_level, 8);
BTRFS_SETGET_STACK_FUNCS(backup_dev_root, struct btrfs_root_backup,
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 33/67] btrfs-progs: add the stack prefix for backup_dev_root set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (31 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 32/67] btrfs-progs: add the stack prefix for backup_fs_root_level " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 34/67] btrfs-progs: add the stack prefix for backup_dev_root_gen " Lu Fengqi
` (34 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The backup_dev_root set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 2 +-
ctree.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 15828ad2..7821f2d4 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -169,7 +169,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
btrfs_stack_backup_fs_root_gen(backup),
btrfs_stack_backup_fs_root_level(backup));
printf("\t\tbackup_dev_root:\t%llu\tgen: %llu\tlevel: %d\n",
- btrfs_backup_dev_root(backup),
+ btrfs_stack_backup_dev_root(backup),
btrfs_backup_dev_root_gen(backup),
btrfs_backup_dev_root_level(backup));
printf("\t\tbackup_csum_root:\t%llu\tgen: %llu\tlevel: %d\n",
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 6ad9ed1d..8c5ce79d 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -100,7 +100,7 @@ static void print_old_roots(struct btrfs_super_block *super)
printf("\t\tdevice root gen %llu block %llu\n",
(unsigned long long)btrfs_backup_dev_root_gen(backup),
- (unsigned long long)btrfs_backup_dev_root(backup));
+ (unsigned long long)btrfs_stack_backup_dev_root(backup));
printf("\t\tcsum root gen %llu block %llu\n",
(unsigned long long)btrfs_backup_csum_root_gen(backup),
diff --git a/ctree.h b/ctree.h
index 62eecf7f..292d8463 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2139,7 +2139,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_fs_root_gen, struct btrfs_root_backup,
BTRFS_SETGET_STACK_FUNCS(stack_backup_fs_root_level, struct btrfs_root_backup,
fs_root_level, 8);
-BTRFS_SETGET_STACK_FUNCS(backup_dev_root, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_dev_root, struct btrfs_root_backup,
dev_root, 64);
BTRFS_SETGET_STACK_FUNCS(backup_dev_root_gen, struct btrfs_root_backup,
dev_root_gen, 64);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 34/67] btrfs-progs: add the stack prefix for backup_dev_root_gen set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (32 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 33/67] btrfs-progs: add the stack prefix for backup_dev_root " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 35/67] btrfs-progs: add the stack prefix for backup_dev_root_level " Lu Fengqi
` (33 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The backup_dev_root_gen set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 4 ++--
ctree.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 7821f2d4..bb98d99c 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -170,7 +170,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
btrfs_stack_backup_fs_root_level(backup));
printf("\t\tbackup_dev_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_stack_backup_dev_root(backup),
- btrfs_backup_dev_root_gen(backup),
+ btrfs_stack_backup_dev_root_gen(backup),
btrfs_backup_dev_root_level(backup));
printf("\t\tbackup_csum_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_backup_csum_root(backup),
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 8c5ce79d..934070a2 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -99,8 +99,8 @@ static void print_old_roots(struct btrfs_super_block *super)
(unsigned long long)btrfs_stack_backup_chunk_root(backup));
printf("\t\tdevice root gen %llu block %llu\n",
- (unsigned long long)btrfs_backup_dev_root_gen(backup),
- (unsigned long long)btrfs_stack_backup_dev_root(backup));
+ (unsigned long long)btrfs_stack_backup_dev_root_gen(backup),
+ (unsigned long long)btrfs_stack_backup_dev_root(backup));
printf("\t\tcsum root gen %llu block %llu\n",
(unsigned long long)btrfs_backup_csum_root_gen(backup),
diff --git a/ctree.h b/ctree.h
index 292d8463..16de801c 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2141,7 +2141,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_fs_root_level, struct btrfs_root_backup,
BTRFS_SETGET_STACK_FUNCS(stack_backup_dev_root, struct btrfs_root_backup,
dev_root, 64);
-BTRFS_SETGET_STACK_FUNCS(backup_dev_root_gen, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_dev_root_gen, struct btrfs_root_backup,
dev_root_gen, 64);
BTRFS_SETGET_STACK_FUNCS(backup_dev_root_level, struct btrfs_root_backup,
dev_root_level, 8);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 35/67] btrfs-progs: add the stack prefix for backup_dev_root_level set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (33 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 34/67] btrfs-progs: add the stack prefix for backup_dev_root_gen " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 36/67] btrfs-progs: add the stack prefix for backup_csum_root " Lu Fengqi
` (32 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The backup_dev_root_level set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
ctree.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index bb98d99c..5b0678d5 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -171,7 +171,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
printf("\t\tbackup_dev_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_stack_backup_dev_root(backup),
btrfs_stack_backup_dev_root_gen(backup),
- btrfs_backup_dev_root_level(backup));
+ btrfs_stack_backup_dev_root_level(backup));
printf("\t\tbackup_csum_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_backup_csum_root(backup),
btrfs_backup_csum_root_gen(backup),
diff --git a/ctree.h b/ctree.h
index 16de801c..95ce1f13 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2143,7 +2143,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_dev_root, struct btrfs_root_backup,
dev_root, 64);
BTRFS_SETGET_STACK_FUNCS(stack_backup_dev_root_gen, struct btrfs_root_backup,
dev_root_gen, 64);
-BTRFS_SETGET_STACK_FUNCS(backup_dev_root_level, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_dev_root_level, struct btrfs_root_backup,
dev_root_level, 8);
BTRFS_SETGET_STACK_FUNCS(backup_csum_root, struct btrfs_root_backup,
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 36/67] btrfs-progs: add the stack prefix for backup_csum_root set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (34 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 35/67] btrfs-progs: add the stack prefix for backup_dev_root_level " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 37/67] btrfs-progs: add the stack prefix for backup_csum_root_gen " Lu Fengqi
` (31 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The backup_csum_root set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 4 ++--
ctree.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 5b0678d5..80cf0418 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -173,7 +173,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
btrfs_stack_backup_dev_root_gen(backup),
btrfs_stack_backup_dev_root_level(backup));
printf("\t\tbackup_csum_root:\t%llu\tgen: %llu\tlevel: %d\n",
- btrfs_backup_csum_root(backup),
+ btrfs_stack_backup_csum_root(backup),
btrfs_backup_csum_root_gen(backup),
btrfs_backup_csum_root_level(backup));
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 934070a2..4e6a20a4 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -103,8 +103,8 @@ static void print_old_roots(struct btrfs_super_block *super)
(unsigned long long)btrfs_stack_backup_dev_root(backup));
printf("\t\tcsum root gen %llu block %llu\n",
- (unsigned long long)btrfs_backup_csum_root_gen(backup),
- (unsigned long long)btrfs_backup_csum_root(backup));
+ (unsigned long long)btrfs_backup_csum_root_gen(backup),
+ (unsigned long long)btrfs_stack_backup_csum_root(backup));
printf("\t\tfs root gen %llu block %llu\n",
(unsigned long long)btrfs_stack_backup_fs_root_gen(backup),
diff --git a/ctree.h b/ctree.h
index 95ce1f13..86666378 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2146,7 +2146,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_dev_root_gen, struct btrfs_root_backup,
BTRFS_SETGET_STACK_FUNCS(stack_backup_dev_root_level, struct btrfs_root_backup,
dev_root_level, 8);
-BTRFS_SETGET_STACK_FUNCS(backup_csum_root, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_csum_root, struct btrfs_root_backup,
csum_root, 64);
BTRFS_SETGET_STACK_FUNCS(backup_csum_root_gen, struct btrfs_root_backup,
csum_root_gen, 64);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 37/67] btrfs-progs: add the stack prefix for backup_csum_root_gen set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (35 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 36/67] btrfs-progs: add the stack prefix for backup_csum_root " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 38/67] btrfs-progs: add the stack prefix for backup_csum_root_level " Lu Fengqi
` (30 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The backup_csum_root_gen set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 2 +-
ctree.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 80cf0418..fc5eea8a 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -174,7 +174,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
btrfs_stack_backup_dev_root_level(backup));
printf("\t\tbackup_csum_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_stack_backup_csum_root(backup),
- btrfs_backup_csum_root_gen(backup),
+ btrfs_stack_backup_csum_root_gen(backup),
btrfs_backup_csum_root_level(backup));
printf("\t\tbackup_total_bytes:\t%llu\n",
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 4e6a20a4..fc63a6b6 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -103,7 +103,7 @@ static void print_old_roots(struct btrfs_super_block *super)
(unsigned long long)btrfs_stack_backup_dev_root(backup));
printf("\t\tcsum root gen %llu block %llu\n",
- (unsigned long long)btrfs_backup_csum_root_gen(backup),
+ (unsigned long long)btrfs_stack_backup_csum_root_gen(backup),
(unsigned long long)btrfs_stack_backup_csum_root(backup));
printf("\t\tfs root gen %llu block %llu\n",
diff --git a/ctree.h b/ctree.h
index 86666378..355e4b3a 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2148,7 +2148,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_dev_root_level, struct btrfs_root_backup,
BTRFS_SETGET_STACK_FUNCS(stack_backup_csum_root, struct btrfs_root_backup,
csum_root, 64);
-BTRFS_SETGET_STACK_FUNCS(backup_csum_root_gen, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_csum_root_gen, struct btrfs_root_backup,
csum_root_gen, 64);
BTRFS_SETGET_STACK_FUNCS(backup_csum_root_level, struct btrfs_root_backup,
csum_root_level, 8);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 38/67] btrfs-progs: add the stack prefix for backup_csum_root_level set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (36 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 37/67] btrfs-progs: add the stack prefix for backup_csum_root_gen " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 39/67] btrfs-progs: add the stack prefix for backup_total_bytes " Lu Fengqi
` (29 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The backup_csum_root_level set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
ctree.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index fc5eea8a..1d9fe942 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -175,7 +175,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
printf("\t\tbackup_csum_root:\t%llu\tgen: %llu\tlevel: %d\n",
btrfs_stack_backup_csum_root(backup),
btrfs_stack_backup_csum_root_gen(backup),
- btrfs_backup_csum_root_level(backup));
+ btrfs_stack_backup_csum_root_level(backup));
printf("\t\tbackup_total_bytes:\t%llu\n",
btrfs_backup_total_bytes(backup));
diff --git a/ctree.h b/ctree.h
index 355e4b3a..406f21d8 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2150,7 +2150,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_csum_root, struct btrfs_root_backup,
csum_root, 64);
BTRFS_SETGET_STACK_FUNCS(stack_backup_csum_root_gen, struct btrfs_root_backup,
csum_root_gen, 64);
-BTRFS_SETGET_STACK_FUNCS(backup_csum_root_level, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_csum_root_level, struct btrfs_root_backup,
csum_root_level, 8);
BTRFS_SETGET_STACK_FUNCS(backup_total_bytes, struct btrfs_root_backup,
total_bytes, 64);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 39/67] btrfs-progs: add the stack prefix for backup_total_bytes set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (37 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 38/67] btrfs-progs: add the stack prefix for backup_csum_root_level " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 40/67] btrfs-progs: add the stack prefix for backup_bytes_used " Lu Fengqi
` (28 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The backup_total_bytes set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 6 +++---
ctree.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 1d9fe942..51d9fda6 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -178,7 +178,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
btrfs_stack_backup_csum_root_level(backup));
printf("\t\tbackup_total_bytes:\t%llu\n",
- btrfs_backup_total_bytes(backup));
+ btrfs_stack_backup_total_bytes(backup));
printf("\t\tbackup_bytes_used:\t%llu\n",
btrfs_backup_bytes_used(backup));
printf("\t\tbackup_num_devices:\t%llu\n",
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index fc63a6b6..255bdbb9 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -111,9 +111,9 @@ static void print_old_roots(struct btrfs_super_block *super)
(unsigned long long)btrfs_stack_backup_fs_root(backup));
printf("\t\t%llu used %llu total %llu devices\n",
- (unsigned long long)btrfs_backup_bytes_used(backup),
- (unsigned long long)btrfs_backup_total_bytes(backup),
- (unsigned long long)btrfs_backup_num_devices(backup));
+ (unsigned long long)btrfs_backup_bytes_used(backup),
+ (unsigned long long)btrfs_stack_backup_total_bytes(backup),
+ (unsigned long long)btrfs_backup_num_devices(backup));
}
}
diff --git a/ctree.h b/ctree.h
index 406f21d8..8996c978 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2152,7 +2152,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_csum_root_gen, struct btrfs_root_backup,
csum_root_gen, 64);
BTRFS_SETGET_STACK_FUNCS(stack_backup_csum_root_level, struct btrfs_root_backup,
csum_root_level, 8);
-BTRFS_SETGET_STACK_FUNCS(backup_total_bytes, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_total_bytes, struct btrfs_root_backup,
total_bytes, 64);
BTRFS_SETGET_STACK_FUNCS(backup_bytes_used, struct btrfs_root_backup,
bytes_used, 64);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 40/67] btrfs-progs: add the stack prefix for backup_bytes_used set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (38 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 39/67] btrfs-progs: add the stack prefix for backup_total_bytes " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 41/67] btrfs-progs: add the stack prefix for backup_num_devices " Lu Fengqi
` (27 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The backup_bytes_used set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 2 +-
ctree.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 51d9fda6..3a663d06 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -180,7 +180,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
printf("\t\tbackup_total_bytes:\t%llu\n",
btrfs_stack_backup_total_bytes(backup));
printf("\t\tbackup_bytes_used:\t%llu\n",
- btrfs_backup_bytes_used(backup));
+ btrfs_stack_backup_bytes_used(backup));
printf("\t\tbackup_num_devices:\t%llu\n",
btrfs_backup_num_devices(backup));
putchar('\n');
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 255bdbb9..248c2f19 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -111,7 +111,7 @@ static void print_old_roots(struct btrfs_super_block *super)
(unsigned long long)btrfs_stack_backup_fs_root(backup));
printf("\t\t%llu used %llu total %llu devices\n",
- (unsigned long long)btrfs_backup_bytes_used(backup),
+ (unsigned long long)btrfs_stack_backup_bytes_used(backup),
(unsigned long long)btrfs_stack_backup_total_bytes(backup),
(unsigned long long)btrfs_backup_num_devices(backup));
}
diff --git a/ctree.h b/ctree.h
index 8996c978..520f5065 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2154,7 +2154,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_csum_root_level, struct btrfs_root_backup,
csum_root_level, 8);
BTRFS_SETGET_STACK_FUNCS(stack_backup_total_bytes, struct btrfs_root_backup,
total_bytes, 64);
-BTRFS_SETGET_STACK_FUNCS(backup_bytes_used, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_bytes_used, struct btrfs_root_backup,
bytes_used, 64);
BTRFS_SETGET_STACK_FUNCS(backup_num_devices, struct btrfs_root_backup,
num_devices, 64);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 41/67] btrfs-progs: add the stack prefix for backup_num_devices set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (39 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 40/67] btrfs-progs: add the stack prefix for backup_bytes_used " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 42/67] btrfs-progs: add the stack prefix for super_bytenr " Lu Fengqi
` (26 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The backup_num_devices set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 2 +-
ctree.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 3a663d06..fd4a574b 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -182,7 +182,7 @@ static void print_root_backup(struct btrfs_root_backup *backup)
printf("\t\tbackup_bytes_used:\t%llu\n",
btrfs_stack_backup_bytes_used(backup));
printf("\t\tbackup_num_devices:\t%llu\n",
- btrfs_backup_num_devices(backup));
+ btrfs_stack_backup_num_devices(backup));
putchar('\n');
}
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 248c2f19..92aec858 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -113,7 +113,7 @@ static void print_old_roots(struct btrfs_super_block *super)
printf("\t\t%llu used %llu total %llu devices\n",
(unsigned long long)btrfs_stack_backup_bytes_used(backup),
(unsigned long long)btrfs_stack_backup_total_bytes(backup),
- (unsigned long long)btrfs_backup_num_devices(backup));
+ (unsigned long long)btrfs_stack_backup_num_devices(backup));
}
}
diff --git a/ctree.h b/ctree.h
index 520f5065..e159382e 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2156,7 +2156,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_total_bytes, struct btrfs_root_backup,
total_bytes, 64);
BTRFS_SETGET_STACK_FUNCS(stack_backup_bytes_used, struct btrfs_root_backup,
bytes_used, 64);
-BTRFS_SETGET_STACK_FUNCS(backup_num_devices, struct btrfs_root_backup,
+BTRFS_SETGET_STACK_FUNCS(stack_backup_num_devices, struct btrfs_root_backup,
num_devices, 64);
/* struct btrfs_super_block */
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 42/67] btrfs-progs: add the stack prefix for super_bytenr set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (40 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 41/67] btrfs-progs: add the stack prefix for backup_num_devices " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 43/67] btrfs-progs: add the stack prefix for super_flags " Lu Fengqi
` (25 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_bytenr set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
convert/common.c | 2 +-
convert/main.c | 4 ++--
ctree.h | 3 ++-
disk-io.c | 8 ++++----
image/main.c | 2 +-
mkfs/common.c | 2 +-
utils.c | 2 +-
8 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index fd4a574b..cbd86c50 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -346,7 +346,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
putchar('\n');
printf("bytenr\t\t\t%llu\n",
- (unsigned long long)btrfs_super_bytenr(sb));
+ (unsigned long long)btrfs_stack_super_bytenr(sb));
printf("flags\t\t\t0x%llx\n",
(unsigned long long)btrfs_super_flags(sb));
print_readable_super_flag(btrfs_super_flags(sb));
diff --git a/convert/common.c b/convert/common.c
index 9a386932..38769081 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -114,7 +114,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg,
uuid_generate(chunk_uuid);
uuid_unparse(chunk_uuid, cfg->chunk_uuid);
- btrfs_set_super_bytenr(super, cfg->super_bytenr);
+ btrfs_set_stack_super_bytenr(super, cfg->super_bytenr);
btrfs_set_super_num_devices(super, 1);
btrfs_set_super_magic(super, BTRFS_MAGIC_PARTIAL);
btrfs_set_super_generation(super, 1);
diff --git a/convert/main.c b/convert/main.c
index a3bcfbd3..66b839e2 100644
--- a/convert/main.c
+++ b/convert/main.c
@@ -1025,8 +1025,8 @@ static int migrate_super_block(int fd, u64 old_bytenr)
goto fail;
super = (struct btrfs_super_block *)buf->data;
- BUG_ON(btrfs_super_bytenr(super) != old_bytenr);
- btrfs_set_super_bytenr(super, BTRFS_SUPER_INFO_OFFSET);
+ BUG_ON(btrfs_stack_super_bytenr(super) != old_bytenr);
+ btrfs_set_stack_super_bytenr(super, BTRFS_SUPER_INFO_OFFSET);
csum_tree_block_size(buf, BTRFS_CRC32_SIZE, 0);
ret = pwrite(fd, buf->data, BTRFS_SUPER_INFO_SIZE,
diff --git a/ctree.h b/ctree.h
index e159382e..14e5aac8 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2161,7 +2161,8 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_num_devices, struct btrfs_root_backup,
/* struct btrfs_super_block */
-BTRFS_SETGET_STACK_FUNCS(super_bytenr, struct btrfs_super_block, bytenr, 64);
+BTRFS_SETGET_STACK_FUNCS(stack_super_bytenr, struct btrfs_super_block, bytenr,
+ 64);
BTRFS_SETGET_STACK_FUNCS(super_flags, struct btrfs_super_block, flags, 64);
BTRFS_SETGET_STACK_FUNCS(super_generation, struct btrfs_super_block,
generation, 64);
diff --git a/disk-io.c b/disk-io.c
index ef147a40..9458242b 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1442,7 +1442,7 @@ int btrfs_read_dev_super(int fd, struct btrfs_super_block *sb, u64 sb_bytenr,
if (ret < BTRFS_SUPER_INFO_SIZE)
return -ENOENT;
- if (btrfs_super_bytenr(buf) != sb_bytenr)
+ if (btrfs_stack_super_bytenr(buf) != sb_bytenr)
return -EIO;
ret = check_super(buf, sbflags);
@@ -1465,7 +1465,7 @@ int btrfs_read_dev_super(int fd, struct btrfs_super_block *sb, u64 sb_bytenr,
if (ret < BTRFS_SUPER_INFO_SIZE)
break;
- if (btrfs_super_bytenr(buf) != bytenr )
+ if (btrfs_stack_super_bytenr(buf) != bytenr)
continue;
/* if magic is NULL, the device was removed */
if (btrfs_super_magic(buf) == 0 && i == 0)
@@ -1503,7 +1503,7 @@ static int write_dev_supers(struct btrfs_fs_info *fs_info,
int i, ret;
if (fs_info->super_bytenr != BTRFS_SUPER_INFO_OFFSET) {
- btrfs_set_super_bytenr(sb, fs_info->super_bytenr);
+ btrfs_set_stack_super_bytenr(sb, fs_info->super_bytenr);
crc = ~(u32)0;
crc = btrfs_csum_data((char *)sb + BTRFS_CSUM_SIZE, crc,
BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE);
@@ -1526,7 +1526,7 @@ static int write_dev_supers(struct btrfs_fs_info *fs_info,
if (bytenr + BTRFS_SUPER_INFO_SIZE > device->total_bytes)
break;
- btrfs_set_super_bytenr(sb, bytenr);
+ btrfs_set_stack_super_bytenr(sb, bytenr);
crc = ~(u32)0;
crc = btrfs_csum_data((char *)sb + BTRFS_CSUM_SIZE, crc,
diff --git a/image/main.c b/image/main.c
index 56244586..84d4d0dd 100644
--- a/image/main.c
+++ b/image/main.c
@@ -1352,7 +1352,7 @@ static void write_backup_supers(int fd, u8 *buf)
bytenr = btrfs_sb_offset(i);
if (bytenr + BTRFS_SUPER_INFO_SIZE > size)
break;
- btrfs_set_super_bytenr(super, bytenr);
+ btrfs_set_stack_super_bytenr(super, bytenr);
csum_block(buf, BTRFS_SUPER_INFO_SIZE);
ret = pwrite64(fd, buf, BTRFS_SUPER_INFO_SIZE, bytenr);
if (ret < BTRFS_SUPER_INFO_SIZE) {
diff --git a/mkfs/common.c b/mkfs/common.c
index 0b3e8173..1845cb14 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -158,7 +158,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
cfg->nodesize * i;
}
- btrfs_set_super_bytenr(&super, cfg->blocks[MKFS_SUPER_BLOCK]);
+ btrfs_set_stack_super_bytenr(&super, cfg->blocks[MKFS_SUPER_BLOCK]);
btrfs_set_super_num_devices(&super, 1);
btrfs_set_super_magic(&super, BTRFS_MAGIC_PARTIAL);
btrfs_set_super_generation(&super, 1);
diff --git a/utils.c b/utils.c
index 2f57617f..d80e02d1 100644
--- a/utils.c
+++ b/utils.c
@@ -236,7 +236,7 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
memcpy(disk_super, super, sizeof(*disk_super));
- btrfs_set_super_bytenr(disk_super, BTRFS_SUPER_INFO_OFFSET);
+ btrfs_set_stack_super_bytenr(disk_super, BTRFS_SUPER_INFO_OFFSET);
btrfs_set_stack_device_id(dev_item, device->devid);
btrfs_set_stack_device_type(dev_item, device->type);
btrfs_set_stack_device_io_align(dev_item, device->io_align);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 43/67] btrfs-progs: add the stack prefix for super_flags set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (41 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 42/67] btrfs-progs: add the stack prefix for super_bytenr " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 44/67] btrfs-progs: add the stack prefix for super_generation " Lu Fengqi
` (24 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_flags set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfstune.c | 14 +++++++-------
chunk-recover.c | 2 +-
cmds-check.c | 2 +-
cmds-inspect-dump-super.c | 4 ++--
ctree.h | 3 ++-
disk-io.c | 10 ++++++----
image/main.c | 8 ++++----
volumes.c | 2 +-
8 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/btrfstune.c b/btrfstune.c
index eccedf79..e502126a 100644
--- a/btrfstune.c
+++ b/btrfstune.c
@@ -45,7 +45,7 @@ static int update_seeding_flag(struct btrfs_root *root, int set_flag)
int ret;
disk_super = root->fs_info->super_copy;
- super_flags = btrfs_super_flags(disk_super);
+ super_flags = btrfs_stack_super_flags(disk_super);
if (set_flag) {
if (super_flags & BTRFS_SUPER_FLAG_SEEDING) {
if (force)
@@ -67,7 +67,7 @@ static int update_seeding_flag(struct btrfs_root *root, int set_flag)
trans = btrfs_start_transaction(root, 1);
BUG_ON(IS_ERR(trans));
- btrfs_set_super_flags(disk_super, super_flags);
+ btrfs_set_stack_super_flags(disk_super, super_flags);
ret = btrfs_commit_transaction(trans, root);
return ret;
@@ -237,11 +237,11 @@ out:
static int change_fsid_prepare(struct btrfs_fs_info *fs_info)
{
struct btrfs_root *tree_root = fs_info->tree_root;
- u64 flags = btrfs_super_flags(fs_info->super_copy);
+ u64 flags = btrfs_stack_super_flags(fs_info->super_copy);
int ret = 0;
flags |= BTRFS_SUPER_FLAG_CHANGING_FSID;
- btrfs_set_super_flags(fs_info->super_copy, flags);
+ btrfs_set_stack_super_flags(fs_info->super_copy, flags);
memcpy(fs_info->super_copy->fsid, fs_info->new_fsid, BTRFS_FSID_SIZE);
ret = write_all_supers(fs_info);
@@ -257,10 +257,10 @@ static int change_fsid_prepare(struct btrfs_fs_info *fs_info)
static int change_fsid_done(struct btrfs_fs_info *fs_info)
{
- u64 flags = btrfs_super_flags(fs_info->super_copy);
+ u64 flags = btrfs_stack_super_flags(fs_info->super_copy);
flags &= ~BTRFS_SUPER_FLAG_CHANGING_FSID;
- btrfs_set_super_flags(fs_info->super_copy, flags);
+ btrfs_set_stack_super_flags(fs_info->super_copy, flags);
return write_all_supers(fs_info);
}
@@ -274,7 +274,7 @@ static int check_unfinished_fsid_change(struct btrfs_fs_info *fs_info,
uuid_t fsid_ret, uuid_t chunk_id_ret)
{
struct btrfs_root *tree_root = fs_info->tree_root;
- u64 flags = btrfs_super_flags(fs_info->super_copy);
+ u64 flags = btrfs_stack_super_flags(fs_info->super_copy);
if (flags & BTRFS_SUPER_FLAG_CHANGING_FSID) {
memcpy(fsid_ret, fs_info->super_copy->fsid, BTRFS_FSID_SIZE);
diff --git a/chunk-recover.c b/chunk-recover.c
index 123cd097..6734212c 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1540,7 +1540,7 @@ static int recover_prepare(struct recover_control *rc, char *path)
rc->csum_size = btrfs_super_csum_size(sb);
/* if seed, the result of scanning below will be partial */
- if (btrfs_super_flags(sb) & BTRFS_SUPER_FLAG_SEEDING) {
+ if (btrfs_stack_super_flags(sb) & BTRFS_SUPER_FLAG_SEEDING) {
fprintf(stderr, "this device is seed device\n");
ret = -1;
goto out_close_fd;
diff --git a/cmds-check.c b/cmds-check.c
index 6070e8d5..170da424 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -11291,7 +11291,7 @@ static bool is_super_size_valid(struct btrfs_fs_info *fs_info)
*
* For a btrfs-image restored fs, we don't need to check it anyway.
*/
- if (btrfs_super_flags(fs_info->super_copy) &
+ if (btrfs_stack_super_flags(fs_info->super_copy) &
(BTRFS_SUPER_FLAG_METADUMP | BTRFS_SUPER_FLAG_METADUMP_V2))
return true;
if (!IS_ALIGNED(super_bytes, fs_info->sectorsize) ||
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index cbd86c50..3a8acd7e 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -348,8 +348,8 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("bytenr\t\t\t%llu\n",
(unsigned long long)btrfs_stack_super_bytenr(sb));
printf("flags\t\t\t0x%llx\n",
- (unsigned long long)btrfs_super_flags(sb));
- print_readable_super_flag(btrfs_super_flags(sb));
+ (unsigned long long)btrfs_stack_super_flags(sb));
+ print_readable_super_flag(btrfs_stack_super_flags(sb));
printf("magic\t\t\t");
s = (char *) &sb->magic;
diff --git a/ctree.h b/ctree.h
index 14e5aac8..fdf274d6 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2163,7 +2163,8 @@ BTRFS_SETGET_STACK_FUNCS(stack_backup_num_devices, struct btrfs_root_backup,
BTRFS_SETGET_STACK_FUNCS(stack_super_bytenr, struct btrfs_super_block, bytenr,
64);
-BTRFS_SETGET_STACK_FUNCS(super_flags, struct btrfs_super_block, flags, 64);
+BTRFS_SETGET_STACK_FUNCS(stack_super_flags, struct btrfs_super_block, flags,
+ 64);
BTRFS_SETGET_STACK_FUNCS(super_generation, struct btrfs_super_block,
generation, 64);
BTRFS_SETGET_STACK_FUNCS(super_root, struct btrfs_super_block, root, 64);
diff --git a/disk-io.c b/disk-io.c
index 9458242b..3a3275b5 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1069,7 +1069,7 @@ int btrfs_setup_chunk_tree_and_device_map(struct btrfs_fs_info *fs_info,
}
}
- if (!(btrfs_super_flags(sb) & BTRFS_SUPER_FLAG_METADUMP)) {
+ if (!(btrfs_stack_super_flags(sb) & BTRFS_SUPER_FLAG_METADUMP)) {
ret = btrfs_read_chunk_tree(fs_info);
if (ret) {
fprintf(stderr, "Couldn't read chunk tree\n");
@@ -1154,7 +1154,8 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path,
goto out_devices;
}
- if (btrfs_super_flags(disk_super) & BTRFS_SUPER_FLAG_CHANGING_FSID &&
+ if (btrfs_stack_super_flags(disk_super) &
+ BTRFS_SUPER_FLAG_CHANGING_FSID &&
!fs_info->ignore_fsid_mismatch) {
fprintf(stderr, "ERROR: Filesystem UUID change in progress\n");
goto out_devices;
@@ -1582,8 +1583,9 @@ int write_all_supers(struct btrfs_fs_info *fs_info)
memcpy(dev_item->uuid, dev->uuid, BTRFS_UUID_SIZE);
memcpy(dev_item->fsid, dev->fs_devices->fsid, BTRFS_UUID_SIZE);
- flags = btrfs_super_flags(sb);
- btrfs_set_super_flags(sb, flags | BTRFS_HEADER_FLAG_WRITTEN);
+ flags = btrfs_stack_super_flags(sb);
+ btrfs_set_stack_super_flags(sb,
+ flags | BTRFS_HEADER_FLAG_WRITTEN);
ret = write_dev_supers(fs_info, sb, dev);
BUG_ON(ret);
diff --git a/image/main.c b/image/main.c
index 84d4d0dd..e9df95ad 100644
--- a/image/main.c
+++ b/image/main.c
@@ -1091,10 +1091,10 @@ static void update_super_old(u8 *buffer)
struct btrfs_chunk *chunk;
struct btrfs_disk_key *key;
u32 sectorsize = btrfs_super_sectorsize(super);
- u64 flags = btrfs_super_flags(super);
+ u64 flags = btrfs_stack_super_flags(super);
flags |= BTRFS_SUPER_FLAG_METADUMP;
- btrfs_set_super_flags(super, flags);
+ btrfs_set_stack_super_flags(super, flags);
key = (struct btrfs_disk_key *)(super->sys_chunk_array);
chunk = (struct btrfs_chunk *)(super->sys_chunk_array +
@@ -1126,7 +1126,7 @@ static int update_super(struct mdrestore_struct *mdres, u8 *buffer)
struct btrfs_chunk *chunk;
struct btrfs_disk_key *disk_key;
struct btrfs_key key;
- u64 flags = btrfs_super_flags(super);
+ u64 flags = btrfs_stack_super_flags(super);
u32 new_array_size = 0;
u32 array_size;
u32 cur = 0;
@@ -1187,7 +1187,7 @@ static int update_super(struct mdrestore_struct *mdres, u8 *buffer)
btrfs_set_super_cache_generation(super, 0);
flags |= BTRFS_SUPER_FLAG_METADUMP_V2;
- btrfs_set_super_flags(super, flags);
+ btrfs_set_stack_super_flags(super, flags);
btrfs_set_super_sys_array_size(super, new_array_size);
btrfs_set_super_num_devices(super, 1);
csum_block(buffer, BTRFS_SUPER_INFO_SIZE);
diff --git a/volumes.c b/volumes.c
index ce3a5405..90c23582 100644
--- a/volumes.c
+++ b/volumes.c
@@ -285,7 +285,7 @@ int btrfs_scan_one_device(int fd, const char *path,
if (ret < 0)
return -EIO;
devid = btrfs_stack_device_id(&disk_super->dev_item);
- if (btrfs_super_flags(disk_super) & BTRFS_SUPER_FLAG_METADUMP)
+ if (btrfs_stack_super_flags(disk_super) & BTRFS_SUPER_FLAG_METADUMP)
*total_devs = 1;
else
*total_devs = btrfs_super_num_devices(disk_super);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 44/67] btrfs-progs: add the stack prefix for super_generation set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (42 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 43/67] btrfs-progs: add the stack prefix for super_flags " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 45/67] btrfs-progs: add the stack prefix for super_root " Lu Fengqi
` (23 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_generation set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfs-find-root.c | 2 +-
chunk-recover.c | 2 +-
cmds-check.c | 2 +-
cmds-inspect-dump-super.c | 2 +-
cmds-restore.c | 2 +-
convert/common.c | 2 +-
ctree.h | 2 +-
disk-io.c | 12 ++++++------
mkfs/common.c | 2 +-
super-recover.c | 4 ++--
volumes.c | 2 +-
11 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/btrfs-find-root.c b/btrfs-find-root.c
index e2d2e70c..df241c97 100644
--- a/btrfs-find-root.c
+++ b/btrfs-find-root.c
@@ -65,7 +65,7 @@ static void get_root_gen_and_level(u64 objectid, struct btrfs_fs_info *fs_info,
switch (objectid) {
case BTRFS_ROOT_TREE_OBJECTID:
level = btrfs_super_root_level(super);
- gen = btrfs_super_generation(super);
+ gen = btrfs_stack_super_generation(super);
break;
case BTRFS_CHUNK_TREE_OBJECTID:
level = btrfs_super_chunk_root_level(super);
diff --git a/chunk-recover.c b/chunk-recover.c
index 6734212c..d0a7cfe0 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1535,7 +1535,7 @@ static int recover_prepare(struct recover_control *rc, char *path)
rc->sectorsize = btrfs_super_sectorsize(sb);
rc->nodesize = btrfs_super_nodesize(sb);
- rc->generation = btrfs_super_generation(sb);
+ rc->generation = btrfs_stack_super_generation(sb);
rc->chunk_root_generation = btrfs_super_chunk_root_generation(sb);
rc->csum_size = btrfs_super_csum_size(sb);
diff --git a/cmds-check.c b/cmds-check.c
index 170da424..6218eddb 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -8647,7 +8647,7 @@ static int check_space_cache(struct btrfs_root *root)
int error = 0;
if (btrfs_super_cache_generation(root->fs_info->super_copy) != -1ULL &&
- btrfs_super_generation(root->fs_info->super_copy) !=
+ btrfs_stack_super_generation(root->fs_info->super_copy) !=
btrfs_super_cache_generation(root->fs_info->super_copy)) {
printf("cache and super generation don't match, space cache "
"will be invalidated\n");
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 3a8acd7e..d525fb4f 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -370,7 +370,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
putchar('\n');
printf("generation\t\t%llu\n",
- (unsigned long long)btrfs_super_generation(sb));
+ (unsigned long long)btrfs_stack_super_generation(sb));
printf("root\t\t\t%llu\n", (unsigned long long)btrfs_super_root(sb));
printf("sys_array_size\t\t%llu\n",
(unsigned long long)btrfs_super_sys_array_size(sb));
diff --git a/cmds-restore.c b/cmds-restore.c
index 37368766..416ff32d 100644
--- a/cmds-restore.c
+++ b/cmds-restore.c
@@ -1303,7 +1303,7 @@ static struct btrfs_root *open_fs(const char *dev, u64 root_location,
root = fs_info->tree_root;
if (!root_location)
root_location = btrfs_super_root(fs_info->super_copy);
- generation = btrfs_super_generation(fs_info->super_copy);
+ generation = btrfs_stack_super_generation(fs_info->super_copy);
root->node = read_tree_block(fs_info, root_location,
generation);
if (!extent_buffer_uptodate(root->node)) {
diff --git a/convert/common.c b/convert/common.c
index 38769081..e509fe5d 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -117,7 +117,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg,
btrfs_set_stack_super_bytenr(super, cfg->super_bytenr);
btrfs_set_super_num_devices(super, 1);
btrfs_set_super_magic(super, BTRFS_MAGIC_PARTIAL);
- btrfs_set_super_generation(super, 1);
+ btrfs_set_stack_super_generation(super, 1);
btrfs_set_super_root(super, root_bytenr);
btrfs_set_super_chunk_root(super, chunk_bytenr);
btrfs_set_super_total_bytes(super, cfg->num_bytes);
diff --git a/ctree.h b/ctree.h
index fdf274d6..bf7a4d75 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2165,7 +2165,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_bytenr, struct btrfs_super_block, bytenr,
64);
BTRFS_SETGET_STACK_FUNCS(stack_super_flags, struct btrfs_super_block, flags,
64);
-BTRFS_SETGET_STACK_FUNCS(super_generation, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_generation, struct btrfs_super_block,
generation, 64);
BTRFS_SETGET_STACK_FUNCS(super_root, struct btrfs_super_block, root, 64);
BTRFS_SETGET_STACK_FUNCS(super_sys_array_size,
diff --git a/disk-io.c b/disk-io.c
index 3a3275b5..c5c7ee10 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -522,7 +522,7 @@ static int find_and_setup_log_root(struct btrfs_root *tree_root,
BTRFS_TREE_LOG_OBJECTID);
log_root->node = read_tree_block(fs_info, blocknr,
- btrfs_super_generation(disk_super) + 1);
+ btrfs_stack_super_generation(disk_super) + 1);
fs_info->log_root_tree = log_root;
@@ -793,7 +793,7 @@ int btrfs_check_fs_compatibility(struct btrfs_super_block *sb,
static int find_best_backup_root(struct btrfs_super_block *super)
{
struct btrfs_root_backup *backup;
- u64 orig_gen = btrfs_super_generation(super);
+ u64 orig_gen = btrfs_stack_super_generation(super);
u64 gen = 0;
int best_index = 0;
int i;
@@ -847,7 +847,7 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info, u64 root_tree_bytenr,
root = fs_info->tree_root;
btrfs_setup_root(root, fs_info, BTRFS_ROOT_TREE_OBJECTID);
- generation = btrfs_super_generation(sb);
+ generation = btrfs_stack_super_generation(sb);
if (!root_tree_bytenr && !(flags & OPEN_CTREE_BACKUP_ROOT)) {
root_tree_bytenr = btrfs_super_root(sb);
@@ -1486,9 +1486,9 @@ int btrfs_read_dev_super(int fd, struct btrfs_super_block *sb, u64 sb_bytenr,
continue;
}
- if (btrfs_super_generation(buf) > transid) {
+ if (btrfs_stack_super_generation(buf) > transid) {
memcpy(sb, buf, BTRFS_SUPER_INFO_SIZE);
- transid = btrfs_super_generation(buf);
+ transid = btrfs_stack_super_generation(buf);
}
}
@@ -1603,7 +1603,7 @@ int write_ctree_super(struct btrfs_trans_handle *trans,
if (fs_info->readonly)
return 0;
- btrfs_set_super_generation(fs_info->super_copy,
+ btrfs_set_stack_super_generation(fs_info->super_copy,
trans->transid);
btrfs_set_super_root(fs_info->super_copy,
tree_root->node->start);
diff --git a/mkfs/common.c b/mkfs/common.c
index 1845cb14..1ebacbc6 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -161,7 +161,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_stack_super_bytenr(&super, cfg->blocks[MKFS_SUPER_BLOCK]);
btrfs_set_super_num_devices(&super, 1);
btrfs_set_super_magic(&super, BTRFS_MAGIC_PARTIAL);
- btrfs_set_super_generation(&super, 1);
+ btrfs_set_stack_super_generation(&super, 1);
btrfs_set_super_root(&super, cfg->blocks[MKFS_ROOT_TREE]);
btrfs_set_super_chunk_root(&super, cfg->blocks[MKFS_CHUNK_TREE]);
btrfs_set_super_total_bytes(&super, num_bytes);
diff --git a/super-recover.c b/super-recover.c
index 6b80416f..2a82aa75 100644
--- a/super-recover.c
+++ b/super-recover.c
@@ -133,7 +133,7 @@ read_dev_supers(char *filename, struct btrfs_recover_superblock *recover)
&recover->good_supers);
if (ret)
goto out;
- max_gen = btrfs_super_generation(sb);
+ max_gen = btrfs_stack_super_generation(sb);
if (max_gen > recover->max_generation)
recover->max_generation = max_gen;
} else if (ret == -EIO){
@@ -169,7 +169,7 @@ static int read_fs_supers(struct btrfs_recover_superblock *recover)
}
list_for_each_entry_safe(record, next_record,
&recover->good_supers, list) {
- gen = btrfs_super_generation(&record->sb);
+ gen = btrfs_stack_super_generation(&record->sb);
if (gen < recover->max_generation)
list_move_tail(&record->list, &recover->bad_supers);
}
diff --git a/volumes.c b/volumes.c
index 90c23582..20203024 100644
--- a/volumes.c
+++ b/volumes.c
@@ -89,7 +89,7 @@ static int device_list_add(const char *path,
{
struct btrfs_device *device;
struct btrfs_fs_devices *fs_devices;
- u64 found_transid = btrfs_super_generation(disk_super);
+ u64 found_transid = btrfs_stack_super_generation(disk_super);
fs_devices = find_fsid(disk_super->fsid);
if (!fs_devices) {
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 45/67] btrfs-progs: add the stack prefix for super_root set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (43 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 44/67] btrfs-progs: add the stack prefix for super_generation " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 46/67] btrfs-progs: add the stack prefix for super_sys_array_size " Lu Fengqi
` (22 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_root set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 3 ++-
cmds-restore.c | 3 ++-
convert/common.c | 2 +-
ctree.h | 2 +-
disk-io.c | 9 +++++----
mkfs/common.c | 2 +-
6 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index d525fb4f..44dab1bc 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -371,7 +371,8 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("generation\t\t%llu\n",
(unsigned long long)btrfs_stack_super_generation(sb));
- printf("root\t\t\t%llu\n", (unsigned long long)btrfs_super_root(sb));
+ printf("root\t\t\t%llu\n",
+ (unsigned long long)btrfs_stack_super_root(sb));
printf("sys_array_size\t\t%llu\n",
(unsigned long long)btrfs_super_sys_array_size(sb));
printf("chunk_root_generation\t%llu\n",
diff --git a/cmds-restore.c b/cmds-restore.c
index 416ff32d..f9e529b6 100644
--- a/cmds-restore.c
+++ b/cmds-restore.c
@@ -1302,7 +1302,8 @@ static struct btrfs_root *open_fs(const char *dev, u64 root_location,
root = fs_info->tree_root;
if (!root_location)
- root_location = btrfs_super_root(fs_info->super_copy);
+ root_location = btrfs_stack_super_root(
+ fs_info->super_copy);
generation = btrfs_stack_super_generation(fs_info->super_copy);
root->node = read_tree_block(fs_info, root_location,
generation);
diff --git a/convert/common.c b/convert/common.c
index e509fe5d..bca52547 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -118,7 +118,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg,
btrfs_set_super_num_devices(super, 1);
btrfs_set_super_magic(super, BTRFS_MAGIC_PARTIAL);
btrfs_set_stack_super_generation(super, 1);
- btrfs_set_super_root(super, root_bytenr);
+ btrfs_set_stack_super_root(super, root_bytenr);
btrfs_set_super_chunk_root(super, chunk_bytenr);
btrfs_set_super_total_bytes(super, cfg->num_bytes);
/*
diff --git a/ctree.h b/ctree.h
index bf7a4d75..8e21ffa6 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2167,7 +2167,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_flags, struct btrfs_super_block, flags,
64);
BTRFS_SETGET_STACK_FUNCS(stack_super_generation, struct btrfs_super_block,
generation, 64);
-BTRFS_SETGET_STACK_FUNCS(super_root, struct btrfs_super_block, root, 64);
+BTRFS_SETGET_STACK_FUNCS(stack_super_root, struct btrfs_super_block, root, 64);
BTRFS_SETGET_STACK_FUNCS(super_sys_array_size,
struct btrfs_super_block, sys_chunk_array_size, 32);
BTRFS_SETGET_STACK_FUNCS(super_chunk_root_generation,
diff --git a/disk-io.c b/disk-io.c
index c5c7ee10..7dbac348 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -850,7 +850,7 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info, u64 root_tree_bytenr,
generation = btrfs_stack_super_generation(sb);
if (!root_tree_bytenr && !(flags & OPEN_CTREE_BACKUP_ROOT)) {
- root_tree_bytenr = btrfs_super_root(sb);
+ root_tree_bytenr = btrfs_stack_super_root(sb);
} else if (flags & OPEN_CTREE_BACKUP_ROOT) {
struct btrfs_root_backup *backup;
int index = find_best_backup_root(sb);
@@ -1324,8 +1324,9 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
goto error_out;
}
- if (!IS_ALIGNED(btrfs_super_root(sb), 4096)) {
- error("tree_root block unaligned: %llu", btrfs_super_root(sb));
+ if (!IS_ALIGNED(btrfs_stack_super_root(sb), 4096)) {
+ error("tree_root block unaligned: %llu",
+ btrfs_stack_super_root(sb));
goto error_out;
}
if (!IS_ALIGNED(btrfs_super_chunk_root(sb), 4096)) {
@@ -1605,7 +1606,7 @@ int write_ctree_super(struct btrfs_trans_handle *trans,
btrfs_set_stack_super_generation(fs_info->super_copy,
trans->transid);
- btrfs_set_super_root(fs_info->super_copy,
+ btrfs_set_stack_super_root(fs_info->super_copy,
tree_root->node->start);
btrfs_set_super_root_level(fs_info->super_copy,
btrfs_header_level(tree_root->node));
diff --git a/mkfs/common.c b/mkfs/common.c
index 1ebacbc6..33cd5ed9 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -162,7 +162,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_super_num_devices(&super, 1);
btrfs_set_super_magic(&super, BTRFS_MAGIC_PARTIAL);
btrfs_set_stack_super_generation(&super, 1);
- btrfs_set_super_root(&super, cfg->blocks[MKFS_ROOT_TREE]);
+ btrfs_set_stack_super_root(&super, cfg->blocks[MKFS_ROOT_TREE]);
btrfs_set_super_chunk_root(&super, cfg->blocks[MKFS_CHUNK_TREE]);
btrfs_set_super_total_bytes(&super, num_bytes);
btrfs_set_super_bytes_used(&super, 6 * cfg->nodesize);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 46/67] btrfs-progs: add the stack prefix for super_sys_array_size set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (44 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 45/67] btrfs-progs: add the stack prefix for super_root " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 47/67] btrfs-progs: add the stack prefix for super_chunk_root_generation " Lu Fengqi
` (21 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_sys_array_size set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
chunk-recover.c | 2 +-
cmds-inspect-dump-super.c | 4 ++--
convert/common.c | 6 +++---
ctree.h | 2 +-
disk-io.c | 9 +++++----
extent-tree.c | 6 +++---
image/main.c | 7 ++++---
mkfs/common.c | 2 +-
volumes.c | 7 ++++---
9 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/chunk-recover.c b/chunk-recover.c
index d0a7cfe0..df5e2850 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1294,7 +1294,7 @@ static int rebuild_sys_array(struct recover_control *rc,
int ret = 0;
u16 num_stripes;
- btrfs_set_super_sys_array_size(fs_info->super_copy, 0);
+ btrfs_set_stack_super_sys_array_size(fs_info->super_copy, 0);
list_for_each_entry(chunk_rec, &rc->good_chunks, list) {
if (!(chunk_rec->type_flags & BTRFS_BLOCK_GROUP_SYSTEM))
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 44dab1bc..0f28f1c9 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -68,7 +68,7 @@ static void print_sys_chunk_array(struct btrfs_super_block *sb)
}
write_extent_buffer(buf, sb, 0, sizeof(*sb));
buf->len = sizeof(*sb);
- array_size = btrfs_super_sys_array_size(sb);
+ array_size = btrfs_stack_super_sys_array_size(sb);
array_ptr = sb->sys_chunk_array;
sb_array_offset = offsetof(struct btrfs_super_block, sys_chunk_array);
@@ -374,7 +374,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("root\t\t\t%llu\n",
(unsigned long long)btrfs_stack_super_root(sb));
printf("sys_array_size\t\t%llu\n",
- (unsigned long long)btrfs_super_sys_array_size(sb));
+ (unsigned long long)btrfs_stack_super_sys_array_size(sb));
printf("chunk_root_generation\t%llu\n",
(unsigned long long)btrfs_super_chunk_root_generation(sb));
printf("root_level\t\t%llu\n",
diff --git a/convert/common.c b/convert/common.c
index bca52547..58b071c8 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -400,15 +400,15 @@ static int insert_temp_chunk_item(int fd, struct extent_buffer *buf,
u32 array_size;
cur = (char *)sb->sys_chunk_array
- + btrfs_super_sys_array_size(sb);
+ + btrfs_stack_super_sys_array_size(sb);
memcpy(cur, &disk_key, sizeof(disk_key));
cur += sizeof(disk_key);
read_extent_buffer(buf, cur, (unsigned long int)chunk,
btrfs_chunk_item_size(1));
- array_size = btrfs_super_sys_array_size(sb);
+ array_size = btrfs_stack_super_sys_array_size(sb);
array_size += btrfs_chunk_item_size(1) +
sizeof(disk_key);
- btrfs_set_super_sys_array_size(sb, array_size);
+ btrfs_set_stack_super_sys_array_size(sb, array_size);
ret = write_temp_super(fd, sb, cfg->super_bytenr);
}
diff --git a/ctree.h b/ctree.h
index 8e21ffa6..49b047c5 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2168,7 +2168,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_flags, struct btrfs_super_block, flags,
BTRFS_SETGET_STACK_FUNCS(stack_super_generation, struct btrfs_super_block,
generation, 64);
BTRFS_SETGET_STACK_FUNCS(stack_super_root, struct btrfs_super_block, root, 64);
-BTRFS_SETGET_STACK_FUNCS(super_sys_array_size,
+BTRFS_SETGET_STACK_FUNCS(stack_super_sys_array_size,
struct btrfs_super_block, sys_chunk_array_size, 32);
BTRFS_SETGET_STACK_FUNCS(super_chunk_root_generation,
struct btrfs_super_block, chunk_root_generation, 64);
diff --git a/disk-io.c b/disk-io.c
index 7dbac348..b077e8f0 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1399,16 +1399,17 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
* Obvious sys_chunk_array corruptions, it must hold at least one key
* and one chunk
*/
- if (btrfs_super_sys_array_size(sb) > BTRFS_SYSTEM_CHUNK_ARRAY_SIZE) {
+ if (btrfs_stack_super_sys_array_size(sb) >
+ BTRFS_SYSTEM_CHUNK_ARRAY_SIZE) {
error("system chunk array too big %u > %u",
- btrfs_super_sys_array_size(sb),
+ btrfs_stack_super_sys_array_size(sb),
BTRFS_SYSTEM_CHUNK_ARRAY_SIZE);
goto error_out;
}
- if (btrfs_super_sys_array_size(sb) < sizeof(struct btrfs_disk_key)
+ if (btrfs_stack_super_sys_array_size(sb) < sizeof(struct btrfs_disk_key)
+ sizeof(struct btrfs_chunk)) {
error("system chunk array too small %u < %zu",
- btrfs_super_sys_array_size(sb),
+ btrfs_stack_super_sys_array_size(sb),
sizeof(struct btrfs_disk_key) +
sizeof(struct btrfs_chunk));
goto error_out;
diff --git a/extent-tree.c b/extent-tree.c
index a3e4bd1a..f4ca2348 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -3598,12 +3598,12 @@ static int free_system_chunk_item(struct btrfs_super_block *super,
{
struct btrfs_disk_key *disk_key;
struct btrfs_key cpu_key;
- u32 array_size = btrfs_super_sys_array_size(super);
+ u32 array_size = btrfs_stack_super_sys_array_size(super);
char *ptr = (char *)super->sys_chunk_array;
int cur = 0;
int ret = -ENOENT;
- while (cur < btrfs_super_sys_array_size(super)) {
+ while (cur < btrfs_stack_super_sys_array_size(super)) {
struct btrfs_chunk *chunk;
u32 num_stripes;
u32 chunk_len;
@@ -3627,7 +3627,7 @@ static int free_system_chunk_item(struct btrfs_super_block *super,
memmove(ptr + cur, ptr + cur + chunk_len,
array_size - cur - chunk_len);
array_size -= chunk_len;
- btrfs_set_super_sys_array_size(super, array_size);
+ btrfs_set_stack_super_sys_array_size(super, array_size);
ret = 0;
goto out;
}
diff --git a/image/main.c b/image/main.c
index e9df95ad..bd10287d 100644
--- a/image/main.c
+++ b/image/main.c
@@ -1116,7 +1116,8 @@ static void update_super_old(u8 *buffer)
chunk->stripe.devid = super->dev_item.devid;
btrfs_set_stack_stripe_offset(&chunk->stripe, 0);
memcpy(chunk->stripe.dev_uuid, super->dev_item.uuid, BTRFS_UUID_SIZE);
- btrfs_set_super_sys_array_size(super, sizeof(*key) + sizeof(*chunk));
+ btrfs_set_stack_super_sys_array_size(super,
+ sizeof(*key) + sizeof(*chunk));
csum_block(buffer, BTRFS_SUPER_INFO_SIZE);
}
@@ -1134,7 +1135,7 @@ static int update_super(struct mdrestore_struct *mdres, u8 *buffer)
int old_num_stripes;
write_ptr = ptr = super->sys_chunk_array;
- array_size = btrfs_super_sys_array_size(super);
+ array_size = btrfs_stack_super_sys_array_size(super);
while (cur < array_size) {
disk_key = (struct btrfs_disk_key *)ptr;
@@ -1188,7 +1189,7 @@ static int update_super(struct mdrestore_struct *mdres, u8 *buffer)
flags |= BTRFS_SUPER_FLAG_METADUMP_V2;
btrfs_set_stack_super_flags(super, flags);
- btrfs_set_super_sys_array_size(super, new_array_size);
+ btrfs_set_stack_super_sys_array_size(super, new_array_size);
btrfs_set_super_num_devices(super, 1);
csum_block(buffer, BTRFS_SUPER_INFO_SIZE);
diff --git a/mkfs/common.c b/mkfs/common.c
index 33cd5ed9..2d31b3e6 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -346,7 +346,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
read_extent_buffer(buf, ptr, (unsigned long)chunk, item_size);
array_size += item_size;
ptr += item_size;
- btrfs_set_super_sys_array_size(&super, array_size);
+ btrfs_set_stack_super_sys_array_size(&super, array_size);
btrfs_set_header_bytenr(buf, cfg->blocks[MKFS_CHUNK_TREE]);
btrfs_set_header_owner(buf, BTRFS_CHUNK_TREE_OBJECTID);
diff --git a/volumes.c b/volumes.c
index 20203024..8601dbe6 100644
--- a/volumes.c
+++ b/volumes.c
@@ -712,7 +712,7 @@ int btrfs_add_system_chunk(struct btrfs_fs_info *fs_info, struct btrfs_key *key,
u32 array_size;
u8 *ptr;
- array_size = btrfs_super_sys_array_size(super_copy);
+ array_size = btrfs_stack_super_sys_array_size(super_copy);
if (array_size + item_size + sizeof(disk_key)
> BTRFS_SYSTEM_CHUNK_ARRAY_SIZE)
return -EFBIG;
@@ -723,7 +723,8 @@ int btrfs_add_system_chunk(struct btrfs_fs_info *fs_info, struct btrfs_key *key,
ptr += sizeof(disk_key);
memcpy(ptr, chunk, item_size);
item_size += sizeof(disk_key);
- btrfs_set_super_sys_array_size(super_copy, array_size + item_size);
+ btrfs_set_stack_super_sys_array_size(super_copy,
+ array_size + item_size);
return 0;
}
@@ -1995,7 +1996,7 @@ int btrfs_read_sys_array(struct btrfs_fs_info *fs_info)
return -ENOMEM;
btrfs_set_buffer_uptodate(sb);
write_extent_buffer(sb, super_copy, 0, sizeof(*super_copy));
- array_size = btrfs_super_sys_array_size(super_copy);
+ array_size = btrfs_stack_super_sys_array_size(super_copy);
array_ptr = super_copy->sys_chunk_array;
sb_array_offset = offsetof(struct btrfs_super_block, sys_chunk_array);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 47/67] btrfs-progs: add the stack prefix for super_chunk_root_generation set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (45 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 46/67] btrfs-progs: add the stack prefix for super_sys_array_size " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 48/67] btrfs-progs: add the stack prefix for super_root_level " Lu Fengqi
` (20 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_chunk_root_generation set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfs-find-root.c | 2 +-
chunk-recover.c | 2 +-
cmds-inspect-dump-super.c | 2 +-
ctree.h | 2 +-
disk-io.c | 4 ++--
mkfs/common.c | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/btrfs-find-root.c b/btrfs-find-root.c
index df241c97..56179935 100644
--- a/btrfs-find-root.c
+++ b/btrfs-find-root.c
@@ -69,7 +69,7 @@ static void get_root_gen_and_level(u64 objectid, struct btrfs_fs_info *fs_info,
break;
case BTRFS_CHUNK_TREE_OBJECTID:
level = btrfs_super_chunk_root_level(super);
- gen = btrfs_super_chunk_root_generation(super);
+ gen = btrfs_stack_super_chunk_root_generation(super);
break;
case BTRFS_TREE_LOG_OBJECTID:
level = btrfs_super_log_root_level(super);
diff --git a/chunk-recover.c b/chunk-recover.c
index df5e2850..a01d4c4f 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1536,7 +1536,7 @@ static int recover_prepare(struct recover_control *rc, char *path)
rc->sectorsize = btrfs_super_sectorsize(sb);
rc->nodesize = btrfs_super_nodesize(sb);
rc->generation = btrfs_stack_super_generation(sb);
- rc->chunk_root_generation = btrfs_super_chunk_root_generation(sb);
+ rc->chunk_root_generation = btrfs_stack_super_chunk_root_generation(sb);
rc->csum_size = btrfs_super_csum_size(sb);
/* if seed, the result of scanning below will be partial */
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 0f28f1c9..49cabca0 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -376,7 +376,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("sys_array_size\t\t%llu\n",
(unsigned long long)btrfs_stack_super_sys_array_size(sb));
printf("chunk_root_generation\t%llu\n",
- (unsigned long long)btrfs_super_chunk_root_generation(sb));
+ (unsigned long long)btrfs_stack_super_chunk_root_generation(sb));
printf("root_level\t\t%llu\n",
(unsigned long long)btrfs_super_root_level(sb));
printf("chunk_root\t\t%llu\n",
diff --git a/ctree.h b/ctree.h
index 49b047c5..919ada4b 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2170,7 +2170,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_generation, struct btrfs_super_block,
BTRFS_SETGET_STACK_FUNCS(stack_super_root, struct btrfs_super_block, root, 64);
BTRFS_SETGET_STACK_FUNCS(stack_super_sys_array_size,
struct btrfs_super_block, sys_chunk_array_size, 32);
-BTRFS_SETGET_STACK_FUNCS(super_chunk_root_generation,
+BTRFS_SETGET_STACK_FUNCS(stack_super_chunk_root_generation,
struct btrfs_super_block, chunk_root_generation, 64);
BTRFS_SETGET_STACK_FUNCS(super_root_level, struct btrfs_super_block,
root_level, 8);
diff --git a/disk-io.c b/disk-io.c
index b077e8f0..9b3b64c5 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1041,7 +1041,7 @@ int btrfs_setup_chunk_tree_and_device_map(struct btrfs_fs_info *fs_info,
if (ret)
return ret;
- generation = btrfs_super_chunk_root_generation(sb);
+ generation = btrfs_stack_super_chunk_root_generation(sb);
if (chunk_root_bytenr && !IS_ALIGNED(chunk_root_bytenr,
fs_info->sectorsize)) {
@@ -1615,7 +1615,7 @@ int write_ctree_super(struct btrfs_trans_handle *trans,
chunk_root->node->start);
btrfs_set_super_chunk_root_level(fs_info->super_copy,
btrfs_header_level(chunk_root->node));
- btrfs_set_super_chunk_root_generation(fs_info->super_copy,
+ btrfs_set_stack_super_chunk_root_generation(fs_info->super_copy,
btrfs_header_generation(chunk_root->node));
ret = write_all_supers(fs_info);
diff --git a/mkfs/common.c b/mkfs/common.c
index 2d31b3e6..fa7abf93 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -171,7 +171,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_super_nodesize(&super, cfg->nodesize);
btrfs_set_super_stripesize(&super, cfg->stripesize);
btrfs_set_super_csum_type(&super, BTRFS_CSUM_TYPE_CRC32);
- btrfs_set_super_chunk_root_generation(&super, 1);
+ btrfs_set_stack_super_chunk_root_generation(&super, 1);
btrfs_set_super_cache_generation(&super, -1);
btrfs_set_super_incompat_flags(&super, cfg->features);
if (cfg->label)
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 48/67] btrfs-progs: add the stack prefix for super_root_level set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (46 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 47/67] btrfs-progs: add the stack prefix for super_chunk_root_generation " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 49/67] btrfs-progs: add the stack prefix for super_chunk_root " Lu Fengqi
` (19 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_root_level set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfs-find-root.c | 2 +-
cmds-inspect-dump-super.c | 2 +-
ctree.h | 2 +-
disk-io.c | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/btrfs-find-root.c b/btrfs-find-root.c
index 56179935..fc8debea 100644
--- a/btrfs-find-root.c
+++ b/btrfs-find-root.c
@@ -64,7 +64,7 @@ static void get_root_gen_and_level(u64 objectid, struct btrfs_fs_info *fs_info,
switch (objectid) {
case BTRFS_ROOT_TREE_OBJECTID:
- level = btrfs_super_root_level(super);
+ level = btrfs_stack_super_root_level(super);
gen = btrfs_stack_super_generation(super);
break;
case BTRFS_CHUNK_TREE_OBJECTID:
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 49cabca0..39c8b536 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -378,7 +378,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("chunk_root_generation\t%llu\n",
(unsigned long long)btrfs_stack_super_chunk_root_generation(sb));
printf("root_level\t\t%llu\n",
- (unsigned long long)btrfs_super_root_level(sb));
+ (unsigned long long)btrfs_stack_super_root_level(sb));
printf("chunk_root\t\t%llu\n",
(unsigned long long)btrfs_super_chunk_root(sb));
printf("chunk_root_level\t%llu\n",
diff --git a/ctree.h b/ctree.h
index 919ada4b..3ca18e22 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2172,7 +2172,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_sys_array_size,
struct btrfs_super_block, sys_chunk_array_size, 32);
BTRFS_SETGET_STACK_FUNCS(stack_super_chunk_root_generation,
struct btrfs_super_block, chunk_root_generation, 64);
-BTRFS_SETGET_STACK_FUNCS(super_root_level, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_root_level, struct btrfs_super_block,
root_level, 8);
BTRFS_SETGET_STACK_FUNCS(super_chunk_root, struct btrfs_super_block,
chunk_root, 64);
diff --git a/disk-io.c b/disk-io.c
index 9b3b64c5..e9411681 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1308,9 +1308,9 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
error("superblock checksum mismatch");
return -EIO;
}
- if (btrfs_super_root_level(sb) >= BTRFS_MAX_LEVEL) {
+ if (btrfs_stack_super_root_level(sb) >= BTRFS_MAX_LEVEL) {
error("tree_root level too big: %d >= %d",
- btrfs_super_root_level(sb), BTRFS_MAX_LEVEL);
+ btrfs_stack_super_root_level(sb), BTRFS_MAX_LEVEL);
goto error_out;
}
if (btrfs_super_chunk_root_level(sb) >= BTRFS_MAX_LEVEL) {
@@ -1609,7 +1609,7 @@ int write_ctree_super(struct btrfs_trans_handle *trans,
trans->transid);
btrfs_set_stack_super_root(fs_info->super_copy,
tree_root->node->start);
- btrfs_set_super_root_level(fs_info->super_copy,
+ btrfs_set_stack_super_root_level(fs_info->super_copy,
btrfs_header_level(tree_root->node));
btrfs_set_super_chunk_root(fs_info->super_copy,
chunk_root->node->start);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 49/67] btrfs-progs: add the stack prefix for super_chunk_root set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (47 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 48/67] btrfs-progs: add the stack prefix for super_root_level " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 50/67] btrfs-progs: add the stack prefix for super_chunk_root_level " Lu Fengqi
` (18 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_chunk_root set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
convert/common.c | 4 ++--
ctree.h | 2 +-
disk-io.c | 8 ++++----
image/main.c | 2 +-
mkfs/common.c | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 39c8b536..bdc10211 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -380,7 +380,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("root_level\t\t%llu\n",
(unsigned long long)btrfs_stack_super_root_level(sb));
printf("chunk_root\t\t%llu\n",
- (unsigned long long)btrfs_super_chunk_root(sb));
+ (unsigned long long)btrfs_stack_super_chunk_root(sb));
printf("chunk_root_level\t%llu\n",
(unsigned long long)btrfs_super_chunk_root_level(sb));
printf("log_root\t\t%llu\n",
diff --git a/convert/common.c b/convert/common.c
index 58b071c8..44944e4e 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -119,7 +119,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg,
btrfs_set_super_magic(super, BTRFS_MAGIC_PARTIAL);
btrfs_set_stack_super_generation(super, 1);
btrfs_set_stack_super_root(super, root_bytenr);
- btrfs_set_super_chunk_root(super, chunk_bytenr);
+ btrfs_set_stack_super_chunk_root(super, chunk_bytenr);
btrfs_set_super_total_bytes(super, cfg->num_bytes);
/*
* Temporary filesystem will only have 6 tree roots:
@@ -132,7 +132,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg,
btrfs_set_super_nodesize(super, cfg->nodesize);
btrfs_set_super_stripesize(super, cfg->stripesize);
btrfs_set_super_csum_type(super, BTRFS_CSUM_TYPE_CRC32);
- btrfs_set_super_chunk_root(super, chunk_bytenr);
+ btrfs_set_stack_super_chunk_root(super, chunk_bytenr);
btrfs_set_super_cache_generation(super, -1);
btrfs_set_super_incompat_flags(super, cfg->features);
if (cfg->label)
diff --git a/ctree.h b/ctree.h
index 3ca18e22..a525f958 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2174,7 +2174,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_chunk_root_generation,
struct btrfs_super_block, chunk_root_generation, 64);
BTRFS_SETGET_STACK_FUNCS(stack_super_root_level, struct btrfs_super_block,
root_level, 8);
-BTRFS_SETGET_STACK_FUNCS(super_chunk_root, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_chunk_root, struct btrfs_super_block,
chunk_root, 64);
BTRFS_SETGET_STACK_FUNCS(super_chunk_root_level, struct btrfs_super_block,
chunk_root_level, 8);
diff --git a/disk-io.c b/disk-io.c
index e9411681..56de9bd2 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1051,7 +1051,7 @@ int btrfs_setup_chunk_tree_and_device_map(struct btrfs_fs_info *fs_info,
}
if (!chunk_root_bytenr)
- chunk_root_bytenr = btrfs_super_chunk_root(sb);
+ chunk_root_bytenr = btrfs_stack_super_chunk_root(sb);
else
generation = 0;
@@ -1329,9 +1329,9 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
btrfs_stack_super_root(sb));
goto error_out;
}
- if (!IS_ALIGNED(btrfs_super_chunk_root(sb), 4096)) {
+ if (!IS_ALIGNED(btrfs_stack_super_chunk_root(sb), 4096)) {
error("chunk_root block unaligned: %llu",
- btrfs_super_chunk_root(sb));
+ btrfs_stack_super_chunk_root(sb));
goto error_out;
}
if (!IS_ALIGNED(btrfs_super_log_root(sb), 4096)) {
@@ -1611,7 +1611,7 @@ int write_ctree_super(struct btrfs_trans_handle *trans,
tree_root->node->start);
btrfs_set_stack_super_root_level(fs_info->super_copy,
btrfs_header_level(tree_root->node));
- btrfs_set_super_chunk_root(fs_info->super_copy,
+ btrfs_set_stack_super_chunk_root(fs_info->super_copy,
chunk_root->node->start);
btrfs_set_super_chunk_root_level(fs_info->super_copy,
btrfs_header_level(chunk_root->node));
diff --git a/image/main.c b/image/main.c
index bd10287d..718ab88e 100644
--- a/image/main.c
+++ b/image/main.c
@@ -2043,7 +2043,7 @@ static int build_chunk_tree(struct mdrestore_struct *mdres,
pthread_mutex_lock(&mdres->mutex);
super = (struct btrfs_super_block *)buffer;
- chunk_root_bytenr = btrfs_super_chunk_root(super);
+ chunk_root_bytenr = btrfs_stack_super_chunk_root(super);
mdres->nodesize = btrfs_super_nodesize(super);
memcpy(mdres->fsid, super->fsid, BTRFS_FSID_SIZE);
memcpy(mdres->uuid, super->dev_item.uuid,
diff --git a/mkfs/common.c b/mkfs/common.c
index fa7abf93..75f8a5f8 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -163,7 +163,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_super_magic(&super, BTRFS_MAGIC_PARTIAL);
btrfs_set_stack_super_generation(&super, 1);
btrfs_set_stack_super_root(&super, cfg->blocks[MKFS_ROOT_TREE]);
- btrfs_set_super_chunk_root(&super, cfg->blocks[MKFS_CHUNK_TREE]);
+ btrfs_set_stack_super_chunk_root(&super, cfg->blocks[MKFS_CHUNK_TREE]);
btrfs_set_super_total_bytes(&super, num_bytes);
btrfs_set_super_bytes_used(&super, 6 * cfg->nodesize);
btrfs_set_super_sectorsize(&super, cfg->sectorsize);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 50/67] btrfs-progs: add the stack prefix for super_chunk_root_level set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (48 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 49/67] btrfs-progs: add the stack prefix for super_chunk_root " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 51/67] btrfs-progs: add the stack prefix for super_log_root " Lu Fengqi
` (17 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_chunk_root_level set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfs-find-root.c | 2 +-
cmds-inspect-dump-super.c | 2 +-
ctree.h | 2 +-
disk-io.c | 7 ++++---
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/btrfs-find-root.c b/btrfs-find-root.c
index fc8debea..5fddf8b3 100644
--- a/btrfs-find-root.c
+++ b/btrfs-find-root.c
@@ -68,7 +68,7 @@ static void get_root_gen_and_level(u64 objectid, struct btrfs_fs_info *fs_info,
gen = btrfs_stack_super_generation(super);
break;
case BTRFS_CHUNK_TREE_OBJECTID:
- level = btrfs_super_chunk_root_level(super);
+ level = btrfs_stack_super_chunk_root_level(super);
gen = btrfs_stack_super_chunk_root_generation(super);
break;
case BTRFS_TREE_LOG_OBJECTID:
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index bdc10211..c4bc3621 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -382,7 +382,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("chunk_root\t\t%llu\n",
(unsigned long long)btrfs_stack_super_chunk_root(sb));
printf("chunk_root_level\t%llu\n",
- (unsigned long long)btrfs_super_chunk_root_level(sb));
+ (unsigned long long)btrfs_stack_super_chunk_root_level(sb));
printf("log_root\t\t%llu\n",
(unsigned long long)btrfs_super_log_root(sb));
printf("log_root_transid\t%llu\n",
diff --git a/ctree.h b/ctree.h
index a525f958..e413b76a 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2176,7 +2176,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_root_level, struct btrfs_super_block,
root_level, 8);
BTRFS_SETGET_STACK_FUNCS(stack_super_chunk_root, struct btrfs_super_block,
chunk_root, 64);
-BTRFS_SETGET_STACK_FUNCS(super_chunk_root_level, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_chunk_root_level, struct btrfs_super_block,
chunk_root_level, 8);
BTRFS_SETGET_STACK_FUNCS(super_log_root, struct btrfs_super_block,
log_root, 64);
diff --git a/disk-io.c b/disk-io.c
index 56de9bd2..4995c295 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1313,9 +1313,10 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
btrfs_stack_super_root_level(sb), BTRFS_MAX_LEVEL);
goto error_out;
}
- if (btrfs_super_chunk_root_level(sb) >= BTRFS_MAX_LEVEL) {
+ if (btrfs_stack_super_chunk_root_level(sb) >= BTRFS_MAX_LEVEL) {
error("chunk_root level too big: %d >= %d",
- btrfs_super_chunk_root_level(sb), BTRFS_MAX_LEVEL);
+ btrfs_stack_super_chunk_root_level(sb),
+ BTRFS_MAX_LEVEL);
goto error_out;
}
if (btrfs_super_log_root_level(sb) >= BTRFS_MAX_LEVEL) {
@@ -1613,7 +1614,7 @@ int write_ctree_super(struct btrfs_trans_handle *trans,
btrfs_header_level(tree_root->node));
btrfs_set_stack_super_chunk_root(fs_info->super_copy,
chunk_root->node->start);
- btrfs_set_super_chunk_root_level(fs_info->super_copy,
+ btrfs_set_stack_super_chunk_root_level(fs_info->super_copy,
btrfs_header_level(chunk_root->node));
btrfs_set_stack_super_chunk_root_generation(fs_info->super_copy,
btrfs_header_generation(chunk_root->node));
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 51/67] btrfs-progs: add the stack prefix for super_log_root set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (49 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 50/67] btrfs-progs: add the stack prefix for super_chunk_root_level " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 52/67] btrfs-progs: add the stack prefix for super_log_root_transid " Lu Fengqi
` (16 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_log_root set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfs-zero-log.c | 4 ++--
cmds-check.c | 4 ++--
cmds-inspect-dump-super.c | 2 +-
cmds-rescue.c | 4 ++--
ctree.h | 2 +-
disk-io.c | 6 +++---
image/main.c | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/btrfs-zero-log.c b/btrfs-zero-log.c
index 2fce59e9..0b6bf539 100644
--- a/btrfs-zero-log.c
+++ b/btrfs-zero-log.c
@@ -65,11 +65,11 @@ int main(int argc, char **argv)
sb = root->fs_info->super_copy;
printf("Clearing log on %s, previous log_root %llu, level %u\n",
argv[optind],
- (unsigned long long)btrfs_super_log_root(sb),
+ (unsigned long long)btrfs_stack_super_log_root(sb),
(unsigned)btrfs_super_log_root_level(sb));
trans = btrfs_start_transaction(root, 1);
BUG_ON(IS_ERR(trans));
- btrfs_set_super_log_root(root->fs_info->super_copy, 0);
+ btrfs_set_stack_super_log_root(root->fs_info->super_copy, 0);
btrfs_set_super_log_root_level(root->fs_info->super_copy, 0);
btrfs_commit_transaction(trans, root);
close_ctree(root);
diff --git a/cmds-check.c b/cmds-check.c
index 6218eddb..b184aa48 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -13967,7 +13967,7 @@ static int zero_log_tree(struct btrfs_root *root)
ret = PTR_ERR(trans);
return ret;
}
- btrfs_set_super_log_root(root->fs_info->super_copy, 0);
+ btrfs_set_stack_super_log_root(root->fs_info->super_copy, 0);
btrfs_set_super_log_root_level(root->fs_info->super_copy, 0);
ret = btrfs_commit_transaction(trans, root);
return ret;
@@ -14868,7 +14868,7 @@ int cmd_check(int argc, char **argv)
* repair mode will force us to commit transaction which
* will make us fail to load log tree when mounting.
*/
- if (repair && btrfs_super_log_root(info->super_copy)) {
+ if (repair && btrfs_stack_super_log_root(info->super_copy)) {
ret = ask_user("repair mode will force to clear out log tree, are you sure?");
if (!ret) {
ret = 1;
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index c4bc3621..91db9d4a 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -384,7 +384,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("chunk_root_level\t%llu\n",
(unsigned long long)btrfs_stack_super_chunk_root_level(sb));
printf("log_root\t\t%llu\n",
- (unsigned long long)btrfs_super_log_root(sb));
+ (unsigned long long)btrfs_stack_super_log_root(sb));
printf("log_root_transid\t%llu\n",
(unsigned long long)btrfs_super_log_root_transid(sb));
printf("log_root_level\t\t%llu\n",
diff --git a/cmds-rescue.c b/cmds-rescue.c
index c40088ad..b3baf47c 100644
--- a/cmds-rescue.c
+++ b/cmds-rescue.c
@@ -190,11 +190,11 @@ static int cmd_rescue_zero_log(int argc, char **argv)
sb = root->fs_info->super_copy;
printf("Clearing log on %s, previous log_root %llu, level %u\n",
devname,
- (unsigned long long)btrfs_super_log_root(sb),
+ (unsigned long long)btrfs_stack_super_log_root(sb),
(unsigned)btrfs_super_log_root_level(sb));
trans = btrfs_start_transaction(root, 1);
BUG_ON(IS_ERR(trans));
- btrfs_set_super_log_root(sb, 0);
+ btrfs_set_stack_super_log_root(sb, 0);
btrfs_set_super_log_root_level(sb, 0);
btrfs_commit_transaction(trans, root);
close_ctree(root);
diff --git a/ctree.h b/ctree.h
index e413b76a..854aa548 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2178,7 +2178,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_chunk_root, struct btrfs_super_block,
chunk_root, 64);
BTRFS_SETGET_STACK_FUNCS(stack_super_chunk_root_level, struct btrfs_super_block,
chunk_root_level, 8);
-BTRFS_SETGET_STACK_FUNCS(super_log_root, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_log_root, struct btrfs_super_block,
log_root, 64);
BTRFS_SETGET_STACK_FUNCS(super_log_root_transid, struct btrfs_super_block,
log_root_transid, 64);
diff --git a/disk-io.c b/disk-io.c
index 4995c295..183121cc 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -507,7 +507,7 @@ static int find_and_setup_log_root(struct btrfs_root *tree_root,
struct btrfs_fs_info *fs_info,
struct btrfs_super_block *disk_super)
{
- u64 blocknr = btrfs_super_log_root(disk_super);
+ u64 blocknr = btrfs_stack_super_log_root(disk_super);
struct btrfs_root *log_root = malloc(sizeof(struct btrfs_root));
if (!log_root)
@@ -1335,9 +1335,9 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
btrfs_stack_super_chunk_root(sb));
goto error_out;
}
- if (!IS_ALIGNED(btrfs_super_log_root(sb), 4096)) {
+ if (!IS_ALIGNED(btrfs_stack_super_log_root(sb), 4096)) {
error("log_root block unaligned: %llu",
- btrfs_super_log_root(sb));
+ btrfs_stack_super_log_root(sb));
goto error_out;
}
if (btrfs_super_nodesize(sb) < 4096) {
diff --git a/image/main.c b/image/main.c
index 718ab88e..b8ab1598 100644
--- a/image/main.c
+++ b/image/main.c
@@ -819,7 +819,7 @@ static int copy_tree_blocks(struct btrfs_root *root, struct extent_buffer *eb,
static int copy_log_trees(struct btrfs_root *root,
struct metadump_struct *metadump)
{
- u64 blocknr = btrfs_super_log_root(root->fs_info->super_copy);
+ u64 blocknr = btrfs_stack_super_log_root(root->fs_info->super_copy);
if (blocknr == 0)
return 0;
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 52/67] btrfs-progs: add the stack prefix for super_log_root_transid set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (50 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 51/67] btrfs-progs: add the stack prefix for super_log_root " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 53/67] btrfs-progs: add the stack prefix for super_log_root_level " Lu Fengqi
` (15 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_log_root_transid set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfs-find-root.c | 2 +-
cmds-inspect-dump-super.c | 2 +-
ctree.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/btrfs-find-root.c b/btrfs-find-root.c
index 5fddf8b3..4c838878 100644
--- a/btrfs-find-root.c
+++ b/btrfs-find-root.c
@@ -73,7 +73,7 @@ static void get_root_gen_and_level(u64 objectid, struct btrfs_fs_info *fs_info,
break;
case BTRFS_TREE_LOG_OBJECTID:
level = btrfs_super_log_root_level(super);
- gen = btrfs_super_log_root_transid(super);
+ gen = btrfs_stack_super_log_root_transid(super);
break;
case BTRFS_UUID_TREE_OBJECTID:
gen = btrfs_super_uuid_tree_generation(super);
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 91db9d4a..aebfa734 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -386,7 +386,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("log_root\t\t%llu\n",
(unsigned long long)btrfs_stack_super_log_root(sb));
printf("log_root_transid\t%llu\n",
- (unsigned long long)btrfs_super_log_root_transid(sb));
+ (unsigned long long)btrfs_stack_super_log_root_transid(sb));
printf("log_root_level\t\t%llu\n",
(unsigned long long)btrfs_super_log_root_level(sb));
printf("total_bytes\t\t%llu\n",
diff --git a/ctree.h b/ctree.h
index 854aa548..17f21bff 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2180,7 +2180,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_chunk_root_level, struct btrfs_super_block,
chunk_root_level, 8);
BTRFS_SETGET_STACK_FUNCS(stack_super_log_root, struct btrfs_super_block,
log_root, 64);
-BTRFS_SETGET_STACK_FUNCS(super_log_root_transid, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_log_root_transid, struct btrfs_super_block,
log_root_transid, 64);
BTRFS_SETGET_STACK_FUNCS(super_log_root_level, struct btrfs_super_block,
log_root_level, 8);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 53/67] btrfs-progs: add the stack prefix for super_log_root_level set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (51 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 52/67] btrfs-progs: add the stack prefix for super_log_root_transid " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 54/67] btrfs-progs: add the stack prefix for super_total_bytes " Lu Fengqi
` (14 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_log_root_level set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfs-find-root.c | 2 +-
btrfs-zero-log.c | 4 ++--
cmds-check.c | 2 +-
cmds-inspect-dump-super.c | 2 +-
cmds-rescue.c | 4 ++--
ctree.h | 2 +-
disk-io.c | 4 ++--
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/btrfs-find-root.c b/btrfs-find-root.c
index 4c838878..08bf2781 100644
--- a/btrfs-find-root.c
+++ b/btrfs-find-root.c
@@ -72,7 +72,7 @@ static void get_root_gen_and_level(u64 objectid, struct btrfs_fs_info *fs_info,
gen = btrfs_stack_super_chunk_root_generation(super);
break;
case BTRFS_TREE_LOG_OBJECTID:
- level = btrfs_super_log_root_level(super);
+ level = btrfs_stack_super_log_root_level(super);
gen = btrfs_stack_super_log_root_transid(super);
break;
case BTRFS_UUID_TREE_OBJECTID:
diff --git a/btrfs-zero-log.c b/btrfs-zero-log.c
index 0b6bf539..87004ec7 100644
--- a/btrfs-zero-log.c
+++ b/btrfs-zero-log.c
@@ -66,11 +66,11 @@ int main(int argc, char **argv)
printf("Clearing log on %s, previous log_root %llu, level %u\n",
argv[optind],
(unsigned long long)btrfs_stack_super_log_root(sb),
- (unsigned)btrfs_super_log_root_level(sb));
+ (unsigned)btrfs_stack_super_log_root_level(sb));
trans = btrfs_start_transaction(root, 1);
BUG_ON(IS_ERR(trans));
btrfs_set_stack_super_log_root(root->fs_info->super_copy, 0);
- btrfs_set_super_log_root_level(root->fs_info->super_copy, 0);
+ btrfs_set_stack_super_log_root_level(root->fs_info->super_copy, 0);
btrfs_commit_transaction(trans, root);
close_ctree(root);
out:
diff --git a/cmds-check.c b/cmds-check.c
index b184aa48..40be3c7b 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -13968,7 +13968,7 @@ static int zero_log_tree(struct btrfs_root *root)
return ret;
}
btrfs_set_stack_super_log_root(root->fs_info->super_copy, 0);
- btrfs_set_super_log_root_level(root->fs_info->super_copy, 0);
+ btrfs_set_stack_super_log_root_level(root->fs_info->super_copy, 0);
ret = btrfs_commit_transaction(trans, root);
return ret;
}
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index aebfa734..3e23184c 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -388,7 +388,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("log_root_transid\t%llu\n",
(unsigned long long)btrfs_stack_super_log_root_transid(sb));
printf("log_root_level\t\t%llu\n",
- (unsigned long long)btrfs_super_log_root_level(sb));
+ (unsigned long long)btrfs_stack_super_log_root_level(sb));
printf("total_bytes\t\t%llu\n",
(unsigned long long)btrfs_super_total_bytes(sb));
printf("bytes_used\t\t%llu\n",
diff --git a/cmds-rescue.c b/cmds-rescue.c
index b3baf47c..f8b82367 100644
--- a/cmds-rescue.c
+++ b/cmds-rescue.c
@@ -191,11 +191,11 @@ static int cmd_rescue_zero_log(int argc, char **argv)
printf("Clearing log on %s, previous log_root %llu, level %u\n",
devname,
(unsigned long long)btrfs_stack_super_log_root(sb),
- (unsigned)btrfs_super_log_root_level(sb));
+ (unsigned)btrfs_stack_super_log_root_level(sb));
trans = btrfs_start_transaction(root, 1);
BUG_ON(IS_ERR(trans));
btrfs_set_stack_super_log_root(sb, 0);
- btrfs_set_super_log_root_level(sb, 0);
+ btrfs_set_stack_super_log_root_level(sb, 0);
btrfs_commit_transaction(trans, root);
close_ctree(root);
diff --git a/ctree.h b/ctree.h
index 17f21bff..3fe38461 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2182,7 +2182,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_log_root, struct btrfs_super_block,
log_root, 64);
BTRFS_SETGET_STACK_FUNCS(stack_super_log_root_transid, struct btrfs_super_block,
log_root_transid, 64);
-BTRFS_SETGET_STACK_FUNCS(super_log_root_level, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_log_root_level, struct btrfs_super_block,
log_root_level, 8);
BTRFS_SETGET_STACK_FUNCS(super_total_bytes, struct btrfs_super_block,
total_bytes, 64);
diff --git a/disk-io.c b/disk-io.c
index 183121cc..1d55bf22 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1319,9 +1319,9 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
BTRFS_MAX_LEVEL);
goto error_out;
}
- if (btrfs_super_log_root_level(sb) >= BTRFS_MAX_LEVEL) {
+ if (btrfs_stack_super_log_root_level(sb) >= BTRFS_MAX_LEVEL) {
error("log_root level too big: %d >= %d",
- btrfs_super_log_root_level(sb), BTRFS_MAX_LEVEL);
+ btrfs_stack_super_log_root_level(sb), BTRFS_MAX_LEVEL);
goto error_out;
}
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 54/67] btrfs-progs: add the stack prefix for super_total_bytes set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (52 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 53/67] btrfs-progs: add the stack prefix for super_log_root_level " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 55/67] btrfs-progs: add the stack prefix for super_bytes_used " Lu Fengqi
` (13 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_total_bytes set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-check.c | 2 +-
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 2 +-
convert/common.c | 2 +-
ctree.h | 2 +-
disk-io.c | 2 +-
extent-tree.c | 2 +-
mkfs/common.c | 2 +-
mkfs/main.c | 3 ++-
utils.c | 5 +++--
volumes.c | 7 ++++---
11 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/cmds-check.c b/cmds-check.c
index 40be3c7b..5d4c2339 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -11271,7 +11271,7 @@ static bool is_super_size_valid(struct btrfs_fs_info *fs_info)
struct btrfs_device *dev;
struct list_head *dev_list = &fs_info->fs_devices->devices;
u64 total_bytes = 0;
- u64 super_bytes = btrfs_super_total_bytes(fs_info->super_copy);
+ u64 super_bytes = btrfs_stack_super_total_bytes(fs_info->super_copy);
list_for_each_entry(dev, dev_list, dev_list)
total_bytes += dev->total_bytes;
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 3e23184c..7855f8ce 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -390,7 +390,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("log_root_level\t\t%llu\n",
(unsigned long long)btrfs_stack_super_log_root_level(sb));
printf("total_bytes\t\t%llu\n",
- (unsigned long long)btrfs_super_total_bytes(sb));
+ (unsigned long long)btrfs_stack_super_total_bytes(sb));
printf("bytes_used\t\t%llu\n",
(unsigned long long)btrfs_super_bytes_used(sb));
printf("sectorsize\t\t%llu\n",
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 92aec858..43cd1648 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -575,7 +575,7 @@ no_node:
print_old_roots(info->super_copy);
printf("total bytes %llu\n",
- (unsigned long long)btrfs_super_total_bytes(info->super_copy));
+ (unsigned long long)btrfs_stack_super_total_bytes(info->super_copy));
printf("bytes used %llu\n",
(unsigned long long)btrfs_super_bytes_used(info->super_copy));
uuidbuf[BTRFS_UUID_UNPARSED_SIZE - 1] = '\0';
diff --git a/convert/common.c b/convert/common.c
index 44944e4e..6f994699 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -120,7 +120,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg,
btrfs_set_stack_super_generation(super, 1);
btrfs_set_stack_super_root(super, root_bytenr);
btrfs_set_stack_super_chunk_root(super, chunk_bytenr);
- btrfs_set_super_total_bytes(super, cfg->num_bytes);
+ btrfs_set_stack_super_total_bytes(super, cfg->num_bytes);
/*
* Temporary filesystem will only have 6 tree roots:
* chunk tree, root tree, extent_tree, device tree, fs tree
diff --git a/ctree.h b/ctree.h
index 3fe38461..5df2f9d8 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2184,7 +2184,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_log_root_transid, struct btrfs_super_block,
log_root_transid, 64);
BTRFS_SETGET_STACK_FUNCS(stack_super_log_root_level, struct btrfs_super_block,
log_root_level, 8);
-BTRFS_SETGET_STACK_FUNCS(super_total_bytes, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_total_bytes, struct btrfs_super_block,
total_bytes, 64);
BTRFS_SETGET_STACK_FUNCS(super_bytes_used, struct btrfs_super_block,
bytes_used, 64);
diff --git a/disk-io.c b/disk-io.c
index 1d55bf22..c6adb168 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1358,7 +1358,7 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
error("sectorsize unaligned: %u", btrfs_super_sectorsize(sb));
goto error_out;
}
- if (btrfs_super_total_bytes(sb) == 0) {
+ if (btrfs_stack_super_total_bytes(sb) == 0) {
error("invalid total_bytes 0");
goto error_out;
}
diff --git a/extent-tree.c b/extent-tree.c
index f4ca2348..a59761e3 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -3400,7 +3400,7 @@ int btrfs_make_block_groups(struct btrfs_trans_handle *trans,
block_group_cache = &fs_info->block_group_cache;
chunk_objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
- total_bytes = btrfs_super_total_bytes(fs_info->super_copy);
+ total_bytes = btrfs_stack_super_total_bytes(fs_info->super_copy);
group_align = 64 * fs_info->sectorsize;
cur_start = 0;
diff --git a/mkfs/common.c b/mkfs/common.c
index 75f8a5f8..60214c0e 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -164,7 +164,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_stack_super_generation(&super, 1);
btrfs_set_stack_super_root(&super, cfg->blocks[MKFS_ROOT_TREE]);
btrfs_set_stack_super_chunk_root(&super, cfg->blocks[MKFS_CHUNK_TREE]);
- btrfs_set_super_total_bytes(&super, num_bytes);
+ btrfs_set_stack_super_total_bytes(&super, num_bytes);
btrfs_set_super_bytes_used(&super, 6 * cfg->nodesize);
btrfs_set_super_sectorsize(&super, cfg->sectorsize);
super.__unused_leafsize = cpu_to_le32(cfg->nodesize);
diff --git a/mkfs/main.c b/mkfs/main.c
index 107c391e..0c58181f 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -1938,7 +1938,8 @@ raid_groups:
printf("Node size: %u\n", nodesize);
printf("Sector size: %u\n", sectorsize);
printf("Filesystem size: %s\n",
- pretty_size(btrfs_super_total_bytes(fs_info->super_copy)));
+ pretty_size(btrfs_stack_super_total_bytes(
+ fs_info->super_copy)));
printf("Block group profiles:\n");
if (allocation.data)
printf(" Data: %-8s %16s\n",
diff --git a/utils.c b/utils.c
index d80e02d1..6787efa1 100644
--- a/utils.c
+++ b/utils.c
@@ -228,8 +228,9 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
if (ret)
goto out;
- fs_total_bytes = btrfs_super_total_bytes(super) + device_total_bytes;
- btrfs_set_super_total_bytes(super, fs_total_bytes);
+ fs_total_bytes = btrfs_stack_super_total_bytes(super) +
+ device_total_bytes;
+ btrfs_set_stack_super_total_bytes(super, fs_total_bytes);
num_devs = btrfs_super_num_devices(super) + 1;
btrfs_set_super_num_devices(super, num_devs);
diff --git a/volumes.c b/volumes.c
index 8601dbe6..5ae2aa81 100644
--- a/volumes.c
+++ b/volumes.c
@@ -951,7 +951,8 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
}
/* we don't want a chunk larger than 10% of the FS */
- percent_max = div_factor(btrfs_super_total_bytes(info->super_copy), 1);
+ percent_max = div_factor(btrfs_stack_super_total_bytes(
+ info->super_copy), 1);
max_chunk_size = min(percent_max, max_chunk_size);
again:
@@ -2438,7 +2439,7 @@ int btrfs_fix_super_size(struct btrfs_fs_info *fs_info)
struct btrfs_device *device;
struct list_head *dev_list = &fs_info->fs_devices->devices;
u64 total_bytes = 0;
- u64 old_bytes = btrfs_super_total_bytes(fs_info->super_copy);
+ u64 old_bytes = btrfs_stack_super_total_bytes(fs_info->super_copy);
int ret;
list_for_each_entry(device, dev_list, dev_list) {
@@ -2458,7 +2459,7 @@ int btrfs_fix_super_size(struct btrfs_fs_info *fs_info)
if (total_bytes == old_bytes)
return 0;
- btrfs_set_super_total_bytes(fs_info->super_copy, total_bytes);
+ btrfs_set_stack_super_total_bytes(fs_info->super_copy, total_bytes);
/* Commit transaction to update all super blocks */
trans = btrfs_start_transaction(fs_info->tree_root, 1);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 55/67] btrfs-progs: add the stack prefix for super_bytes_used set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (53 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 54/67] btrfs-progs: add the stack prefix for super_total_bytes " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 56/67] btrfs-progs: add the stack prefix for super_sectorsize " Lu Fengqi
` (12 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_bytes_used set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
chunk-recover.c | 5 +++--
cmds-inspect-dump-super.c | 2 +-
cmds-inspect-dump-tree.c | 2 +-
convert/common.c | 2 +-
ctree.h | 2 +-
disk-io.c | 5 +++--
extent-tree.c | 6 +++---
mkfs/common.c | 2 +-
mkfs/main.c | 2 +-
volumes.c | 3 ++-
10 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/chunk-recover.c b/chunk-recover.c
index a01d4c4f..d9798d40 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1069,12 +1069,13 @@ again:
del_nr++;
if (key.type == BTRFS_EXTENT_ITEM_KEY ||
key.type == BTRFS_METADATA_ITEM_KEY) {
- old_val = btrfs_super_bytes_used(fs_info->super_copy);
+ old_val = btrfs_stack_super_bytes_used(
+ fs_info->super_copy);
if (key.type == BTRFS_METADATA_ITEM_KEY)
old_val += fs_info->nodesize;
else
old_val += key.offset;
- btrfs_set_super_bytes_used(fs_info->super_copy,
+ btrfs_set_stack_super_bytes_used(fs_info->super_copy,
old_val);
}
}
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 7855f8ce..80a58df7 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -392,7 +392,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("total_bytes\t\t%llu\n",
(unsigned long long)btrfs_stack_super_total_bytes(sb));
printf("bytes_used\t\t%llu\n",
- (unsigned long long)btrfs_super_bytes_used(sb));
+ (unsigned long long)btrfs_stack_super_bytes_used(sb));
printf("sectorsize\t\t%llu\n",
(unsigned long long)btrfs_super_sectorsize(sb));
printf("nodesize\t\t%llu\n",
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 43cd1648..3b6fedd9 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -577,7 +577,7 @@ no_node:
printf("total bytes %llu\n",
(unsigned long long)btrfs_stack_super_total_bytes(info->super_copy));
printf("bytes used %llu\n",
- (unsigned long long)btrfs_super_bytes_used(info->super_copy));
+ (unsigned long long)btrfs_stack_super_bytes_used(info->super_copy));
uuidbuf[BTRFS_UUID_UNPARSED_SIZE - 1] = '\0';
uuid_unparse(info->super_copy->fsid, uuidbuf);
printf("uuid %s\n", uuidbuf);
diff --git a/convert/common.c b/convert/common.c
index 6f994699..d2aaf004 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -126,7 +126,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg,
* chunk tree, root tree, extent_tree, device tree, fs tree
* and csum tree.
*/
- btrfs_set_super_bytes_used(super, 6 * cfg->nodesize);
+ btrfs_set_stack_super_bytes_used(super, 6 * cfg->nodesize);
btrfs_set_super_sectorsize(super, cfg->sectorsize);
super->__unused_leafsize = cpu_to_le32(cfg->nodesize);
btrfs_set_super_nodesize(super, cfg->nodesize);
diff --git a/ctree.h b/ctree.h
index 5df2f9d8..8550a0e2 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2186,7 +2186,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_log_root_level, struct btrfs_super_block,
log_root_level, 8);
BTRFS_SETGET_STACK_FUNCS(stack_super_total_bytes, struct btrfs_super_block,
total_bytes, 64);
-BTRFS_SETGET_STACK_FUNCS(super_bytes_used, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_bytes_used, struct btrfs_super_block,
bytes_used, 64);
BTRFS_SETGET_STACK_FUNCS(super_sectorsize, struct btrfs_super_block,
sectorsize, 32);
diff --git a/disk-io.c b/disk-io.c
index c6adb168..2d04c9cc 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1362,8 +1362,9 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
error("invalid total_bytes 0");
goto error_out;
}
- if (btrfs_super_bytes_used(sb) < 6 * btrfs_super_nodesize(sb)) {
- error("invalid bytes_used %llu", btrfs_super_bytes_used(sb));
+ if (btrfs_stack_super_bytes_used(sb) < 6 * btrfs_super_nodesize(sb)) {
+ error("invalid bytes_used %llu",
+ btrfs_stack_super_bytes_used(sb));
goto error_out;
}
if ((btrfs_super_stripesize(sb) != 4096)
diff --git a/extent-tree.c b/extent-tree.c
index a59761e3..bc4ffd21 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -1935,12 +1935,12 @@ static int update_block_group(struct btrfs_trans_handle *trans,
u64 end;
/* block accounting for super block */
- old_val = btrfs_super_bytes_used(info->super_copy);
+ old_val = btrfs_stack_super_bytes_used(info->super_copy);
if (alloc)
old_val += num_bytes;
else
old_val -= num_bytes;
- btrfs_set_super_bytes_used(info->super_copy, old_val);
+ btrfs_set_stack_super_bytes_used(info->super_copy, old_val);
/* block accounting for root item */
old_val = btrfs_stack_root_used(&root->root_item);
@@ -3911,7 +3911,7 @@ int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans,
}
path.slots[0]++;
}
- btrfs_set_super_bytes_used(root->fs_info->super_copy, bytes_used);
+ btrfs_set_stack_super_bytes_used(root->fs_info->super_copy, bytes_used);
ret = 0;
out:
btrfs_release_path(&path);
diff --git a/mkfs/common.c b/mkfs/common.c
index 60214c0e..69ccd146 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -165,7 +165,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_stack_super_root(&super, cfg->blocks[MKFS_ROOT_TREE]);
btrfs_set_stack_super_chunk_root(&super, cfg->blocks[MKFS_CHUNK_TREE]);
btrfs_set_stack_super_total_bytes(&super, num_bytes);
- btrfs_set_super_bytes_used(&super, 6 * cfg->nodesize);
+ btrfs_set_stack_super_bytes_used(&super, 6 * cfg->nodesize);
btrfs_set_super_sectorsize(&super, cfg->sectorsize);
super.__unused_leafsize = cpu_to_le32(cfg->nodesize);
btrfs_set_super_nodesize(&super, cfg->nodesize);
diff --git a/mkfs/main.c b/mkfs/main.c
index 0c58181f..5cf265ea 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -78,7 +78,7 @@ static int create_metadata_block_groups(struct btrfs_root *root, int mixed,
trans = btrfs_start_transaction(root, 1);
BUG_ON(IS_ERR(trans));
- bytes_used = btrfs_super_bytes_used(fs_info->super_copy);
+ bytes_used = btrfs_stack_super_bytes_used(fs_info->super_copy);
root->fs_info->system_allocs = 1;
ret = btrfs_make_block_group(trans, fs_info, bytes_used,
diff --git a/volumes.c b/volumes.c
index 5ae2aa81..95480f41 100644
--- a/volumes.c
+++ b/volumes.c
@@ -130,7 +130,8 @@ static int device_list_add(const char *path,
return -ENOMEM;
}
device->total_devs = btrfs_super_num_devices(disk_super);
- device->super_bytes_used = btrfs_super_bytes_used(disk_super);
+ device->super_bytes_used =
+ btrfs_stack_super_bytes_used(disk_super);
device->total_bytes =
btrfs_stack_device_total_bytes(&disk_super->dev_item);
device->bytes_used =
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 56/67] btrfs-progs: add the stack prefix for super_sectorsize set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (54 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 55/67] btrfs-progs: add the stack prefix for super_bytes_used " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 57/67] btrfs-progs: add the stack prefix for super_nodesize " Lu Fengqi
` (11 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_sectorsize set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
chunk-recover.c | 4 ++--
cmds-inspect-dump-super.c | 2 +-
convert/common.c | 2 +-
ctree.h | 2 +-
disk-io.c | 14 ++++++++------
image/main.c | 2 +-
mkfs/common.c | 2 +-
7 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/chunk-recover.c b/chunk-recover.c
index d9798d40..c91236d4 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1475,7 +1475,7 @@ open_ctree_with_broken_chunk(struct recover_control *rc)
}
memcpy(fs_info->fsid, &disk_super->fsid, BTRFS_FSID_SIZE);
- fs_info->sectorsize = btrfs_super_sectorsize(disk_super);
+ fs_info->sectorsize = btrfs_stack_super_sectorsize(disk_super);
fs_info->nodesize = btrfs_super_nodesize(disk_super);
fs_info->stripesize = btrfs_super_stripesize(disk_super);
@@ -1534,7 +1534,7 @@ static int recover_prepare(struct recover_control *rc, char *path)
goto out_close_fd;
}
- rc->sectorsize = btrfs_super_sectorsize(sb);
+ rc->sectorsize = btrfs_stack_super_sectorsize(sb);
rc->nodesize = btrfs_super_nodesize(sb);
rc->generation = btrfs_stack_super_generation(sb);
rc->chunk_root_generation = btrfs_stack_super_chunk_root_generation(sb);
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 80a58df7..42ee7b2b 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -394,7 +394,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("bytes_used\t\t%llu\n",
(unsigned long long)btrfs_stack_super_bytes_used(sb));
printf("sectorsize\t\t%llu\n",
- (unsigned long long)btrfs_super_sectorsize(sb));
+ (unsigned long long)btrfs_stack_super_sectorsize(sb));
printf("nodesize\t\t%llu\n",
(unsigned long long)btrfs_super_nodesize(sb));
printf("leafsize (deprecated)\t\t%u\n",
diff --git a/convert/common.c b/convert/common.c
index d2aaf004..307255fa 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -127,7 +127,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg,
* and csum tree.
*/
btrfs_set_stack_super_bytes_used(super, 6 * cfg->nodesize);
- btrfs_set_super_sectorsize(super, cfg->sectorsize);
+ btrfs_set_stack_super_sectorsize(super, cfg->sectorsize);
super->__unused_leafsize = cpu_to_le32(cfg->nodesize);
btrfs_set_super_nodesize(super, cfg->nodesize);
btrfs_set_super_stripesize(super, cfg->stripesize);
diff --git a/ctree.h b/ctree.h
index 8550a0e2..05b88c6a 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2188,7 +2188,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_total_bytes, struct btrfs_super_block,
total_bytes, 64);
BTRFS_SETGET_STACK_FUNCS(stack_super_bytes_used, struct btrfs_super_block,
bytes_used, 64);
-BTRFS_SETGET_STACK_FUNCS(super_sectorsize, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_sectorsize, struct btrfs_super_block,
sectorsize, 32);
BTRFS_SETGET_STACK_FUNCS(super_nodesize, struct btrfs_super_block,
nodesize, 32);
diff --git a/disk-io.c b/disk-io.c
index 2d04c9cc..1bbac5bf 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1162,7 +1162,7 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path,
}
memcpy(fs_info->fsid, &disk_super->fsid, BTRFS_FSID_SIZE);
- fs_info->sectorsize = btrfs_super_sectorsize(disk_super);
+ fs_info->sectorsize = btrfs_stack_super_sectorsize(disk_super);
fs_info->nodesize = btrfs_super_nodesize(disk_super);
fs_info->stripesize = btrfs_super_stripesize(disk_super);
@@ -1349,13 +1349,14 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
error("nodesize unaligned: %u", btrfs_super_nodesize(sb));
goto error_out;
}
- if (btrfs_super_sectorsize(sb) < 4096) {
+ if (btrfs_stack_super_sectorsize(sb) < 4096) {
error("sectorsize too small: %u < 4096",
- btrfs_super_sectorsize(sb));
+ btrfs_stack_super_sectorsize(sb));
goto error_out;
}
- if (!IS_ALIGNED(btrfs_super_sectorsize(sb), 4096)) {
- error("sectorsize unaligned: %u", btrfs_super_sectorsize(sb));
+ if (!IS_ALIGNED(btrfs_stack_super_sectorsize(sb), 4096)) {
+ error("sectorsize unaligned: %u",
+ btrfs_stack_super_sectorsize(sb));
goto error_out;
}
if (btrfs_stack_super_total_bytes(sb) == 0) {
@@ -1368,7 +1369,8 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
goto error_out;
}
if ((btrfs_super_stripesize(sb) != 4096)
- && (btrfs_super_stripesize(sb) != btrfs_super_sectorsize(sb))) {
+ && (btrfs_super_stripesize(sb) !=
+ btrfs_stack_super_sectorsize(sb))) {
error("invalid stripesize %u", btrfs_super_stripesize(sb));
goto error_out;
}
diff --git a/image/main.c b/image/main.c
index b8ab1598..a4c5a8ad 100644
--- a/image/main.c
+++ b/image/main.c
@@ -1090,7 +1090,7 @@ static void update_super_old(u8 *buffer)
struct btrfs_super_block *super = (struct btrfs_super_block *)buffer;
struct btrfs_chunk *chunk;
struct btrfs_disk_key *key;
- u32 sectorsize = btrfs_super_sectorsize(super);
+ u32 sectorsize = btrfs_stack_super_sectorsize(super);
u64 flags = btrfs_stack_super_flags(super);
flags |= BTRFS_SUPER_FLAG_METADUMP;
diff --git a/mkfs/common.c b/mkfs/common.c
index 69ccd146..ed491c20 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -166,7 +166,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_stack_super_chunk_root(&super, cfg->blocks[MKFS_CHUNK_TREE]);
btrfs_set_stack_super_total_bytes(&super, num_bytes);
btrfs_set_stack_super_bytes_used(&super, 6 * cfg->nodesize);
- btrfs_set_super_sectorsize(&super, cfg->sectorsize);
+ btrfs_set_stack_super_sectorsize(&super, cfg->sectorsize);
super.__unused_leafsize = cpu_to_le32(cfg->nodesize);
btrfs_set_super_nodesize(&super, cfg->nodesize);
btrfs_set_super_stripesize(&super, cfg->stripesize);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 57/67] btrfs-progs: add the stack prefix for super_nodesize set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (55 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 56/67] btrfs-progs: add the stack prefix for super_sectorsize " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 58/67] btrfs-progs: add the stack prefix for super_stripesize " Lu Fengqi
` (10 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_nodesize set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
chunk-recover.c | 4 ++--
cmds-check.c | 6 +++---
cmds-inspect-dump-super.c | 2 +-
convert/common.c | 2 +-
ctree.h | 2 +-
disk-io.c | 13 +++++++------
find-root.c | 2 +-
image/main.c | 4 ++--
mkfs/common.c | 2 +-
9 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/chunk-recover.c b/chunk-recover.c
index c91236d4..788b241b 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1476,7 +1476,7 @@ open_ctree_with_broken_chunk(struct recover_control *rc)
memcpy(fs_info->fsid, &disk_super->fsid, BTRFS_FSID_SIZE);
fs_info->sectorsize = btrfs_stack_super_sectorsize(disk_super);
- fs_info->nodesize = btrfs_super_nodesize(disk_super);
+ fs_info->nodesize = btrfs_stack_super_nodesize(disk_super);
fs_info->stripesize = btrfs_super_stripesize(disk_super);
ret = btrfs_check_fs_compatibility(disk_super, OPEN_CTREE_WRITES);
@@ -1535,7 +1535,7 @@ static int recover_prepare(struct recover_control *rc, char *path)
}
rc->sectorsize = btrfs_stack_super_sectorsize(sb);
- rc->nodesize = btrfs_super_nodesize(sb);
+ rc->nodesize = btrfs_stack_super_nodesize(sb);
rc->generation = btrfs_stack_super_generation(sb);
rc->chunk_root_generation = btrfs_stack_super_chunk_root_generation(sb);
rc->csum_size = btrfs_super_csum_size(sb);
diff --git a/cmds-check.c b/cmds-check.c
index 5d4c2339..6c7f9f76 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -12279,7 +12279,7 @@ static int check_tree_block_backref(struct btrfs_fs_info *fs_info, u64 root_id,
struct btrfs_path path;
struct extent_buffer *eb;
struct extent_buffer *node;
- u32 nodesize = btrfs_super_nodesize(fs_info->super_copy);
+ u32 nodesize = btrfs_stack_super_nodesize(fs_info->super_copy);
int err = 0;
int ret;
@@ -12656,7 +12656,7 @@ static int check_extent_item(struct btrfs_trans_handle *trans,
unsigned long ptr;
int slot = path->slots[0];
int type;
- u32 nodesize = btrfs_super_nodesize(fs_info->super_copy);
+ u32 nodesize = btrfs_stack_super_nodesize(fs_info->super_copy);
u32 item_size = btrfs_item_size_nr(eb, slot);
u64 flags;
u64 offset;
@@ -12946,7 +12946,7 @@ static int check_block_group_item(struct btrfs_fs_info *fs_info,
struct btrfs_chunk *chunk;
struct extent_buffer *leaf;
struct btrfs_extent_item *ei;
- u32 nodesize = btrfs_super_nodesize(fs_info->super_copy);
+ u32 nodesize = btrfs_stack_super_nodesize(fs_info->super_copy);
u64 flags;
u64 bg_flags;
u64 used;
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 42ee7b2b..7320bc28 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -396,7 +396,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("sectorsize\t\t%llu\n",
(unsigned long long)btrfs_stack_super_sectorsize(sb));
printf("nodesize\t\t%llu\n",
- (unsigned long long)btrfs_super_nodesize(sb));
+ (unsigned long long)btrfs_stack_super_nodesize(sb));
printf("leafsize (deprecated)\t\t%u\n",
le32_to_cpu(sb->__unused_leafsize));
printf("stripesize\t\t%llu\n",
diff --git a/convert/common.c b/convert/common.c
index 307255fa..81fe80df 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -129,7 +129,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg,
btrfs_set_stack_super_bytes_used(super, 6 * cfg->nodesize);
btrfs_set_stack_super_sectorsize(super, cfg->sectorsize);
super->__unused_leafsize = cpu_to_le32(cfg->nodesize);
- btrfs_set_super_nodesize(super, cfg->nodesize);
+ btrfs_set_stack_super_nodesize(super, cfg->nodesize);
btrfs_set_super_stripesize(super, cfg->stripesize);
btrfs_set_super_csum_type(super, BTRFS_CSUM_TYPE_CRC32);
btrfs_set_stack_super_chunk_root(super, chunk_bytenr);
diff --git a/ctree.h b/ctree.h
index 05b88c6a..a8bad6f2 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2190,7 +2190,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_bytes_used, struct btrfs_super_block,
bytes_used, 64);
BTRFS_SETGET_STACK_FUNCS(stack_super_sectorsize, struct btrfs_super_block,
sectorsize, 32);
-BTRFS_SETGET_STACK_FUNCS(super_nodesize, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_nodesize, struct btrfs_super_block,
nodesize, 32);
BTRFS_SETGET_STACK_FUNCS(super_stripesize, struct btrfs_super_block,
stripesize, 32);
diff --git a/disk-io.c b/disk-io.c
index 1bbac5bf..d17c4163 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1163,7 +1163,7 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path,
memcpy(fs_info->fsid, &disk_super->fsid, BTRFS_FSID_SIZE);
fs_info->sectorsize = btrfs_stack_super_sectorsize(disk_super);
- fs_info->nodesize = btrfs_super_nodesize(disk_super);
+ fs_info->nodesize = btrfs_stack_super_nodesize(disk_super);
fs_info->stripesize = btrfs_super_stripesize(disk_super);
ret = btrfs_check_fs_compatibility(fs_info->super_copy, flags);
@@ -1340,13 +1340,13 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
btrfs_stack_super_log_root(sb));
goto error_out;
}
- if (btrfs_super_nodesize(sb) < 4096) {
+ if (btrfs_stack_super_nodesize(sb) < 4096) {
error("nodesize too small: %u < 4096",
- btrfs_super_nodesize(sb));
+ btrfs_stack_super_nodesize(sb));
goto error_out;
}
- if (!IS_ALIGNED(btrfs_super_nodesize(sb), 4096)) {
- error("nodesize unaligned: %u", btrfs_super_nodesize(sb));
+ if (!IS_ALIGNED(btrfs_stack_super_nodesize(sb), 4096)) {
+ error("nodesize unaligned: %u", btrfs_stack_super_nodesize(sb));
goto error_out;
}
if (btrfs_stack_super_sectorsize(sb) < 4096) {
@@ -1363,7 +1363,8 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
error("invalid total_bytes 0");
goto error_out;
}
- if (btrfs_stack_super_bytes_used(sb) < 6 * btrfs_super_nodesize(sb)) {
+ if (btrfs_stack_super_bytes_used(sb) <
+ 6 * btrfs_stack_super_nodesize(sb)) {
error("invalid bytes_used %llu",
btrfs_stack_super_bytes_used(sb));
goto error_out;
diff --git a/find-root.c b/find-root.c
index 7e4c51f6..39ae782d 100644
--- a/find-root.c
+++ b/find-root.c
@@ -110,7 +110,7 @@ int btrfs_find_root_search(struct btrfs_fs_info *fs_info,
u64 chunk_offset = 0;
u64 chunk_size = 0;
u64 offset = 0;
- u32 nodesize = btrfs_super_nodesize(fs_info->super_copy);
+ u32 nodesize = btrfs_stack_super_nodesize(fs_info->super_copy);
int suppress_errors = 0;
int ret = 0;
diff --git a/image/main.c b/image/main.c
index a4c5a8ad..1a77de98 100644
--- a/image/main.c
+++ b/image/main.c
@@ -1599,7 +1599,7 @@ static int fill_mdres_info(struct mdrestore_struct *mdres,
}
super = (struct btrfs_super_block *)outbuf;
- mdres->nodesize = btrfs_super_nodesize(super);
+ mdres->nodesize = btrfs_stack_super_nodesize(super);
memcpy(mdres->fsid, super->fsid, BTRFS_FSID_SIZE);
memcpy(mdres->uuid, super->dev_item.uuid,
BTRFS_UUID_SIZE);
@@ -2044,7 +2044,7 @@ static int build_chunk_tree(struct mdrestore_struct *mdres,
pthread_mutex_lock(&mdres->mutex);
super = (struct btrfs_super_block *)buffer;
chunk_root_bytenr = btrfs_stack_super_chunk_root(super);
- mdres->nodesize = btrfs_super_nodesize(super);
+ mdres->nodesize = btrfs_stack_super_nodesize(super);
memcpy(mdres->fsid, super->fsid, BTRFS_FSID_SIZE);
memcpy(mdres->uuid, super->dev_item.uuid,
BTRFS_UUID_SIZE);
diff --git a/mkfs/common.c b/mkfs/common.c
index ed491c20..d51f2e15 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -168,7 +168,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_stack_super_bytes_used(&super, 6 * cfg->nodesize);
btrfs_set_stack_super_sectorsize(&super, cfg->sectorsize);
super.__unused_leafsize = cpu_to_le32(cfg->nodesize);
- btrfs_set_super_nodesize(&super, cfg->nodesize);
+ btrfs_set_stack_super_nodesize(&super, cfg->nodesize);
btrfs_set_super_stripesize(&super, cfg->stripesize);
btrfs_set_super_csum_type(&super, BTRFS_CSUM_TYPE_CRC32);
btrfs_set_stack_super_chunk_root_generation(&super, 1);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 58/67] btrfs-progs: add the stack prefix for super_stripesize set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (56 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 57/67] btrfs-progs: add the stack prefix for super_nodesize " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 59/67] btrfs-progs: add the stack prefix for super_root_dir " Lu Fengqi
` (9 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_stripesize set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
chunk-recover.c | 2 +-
cmds-inspect-dump-super.c | 2 +-
convert/common.c | 2 +-
ctree.h | 2 +-
disk-io.c | 9 +++++----
mkfs/common.c | 2 +-
volumes.c | 4 ++--
7 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/chunk-recover.c b/chunk-recover.c
index 788b241b..ad0f36f5 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1477,7 +1477,7 @@ open_ctree_with_broken_chunk(struct recover_control *rc)
memcpy(fs_info->fsid, &disk_super->fsid, BTRFS_FSID_SIZE);
fs_info->sectorsize = btrfs_stack_super_sectorsize(disk_super);
fs_info->nodesize = btrfs_stack_super_nodesize(disk_super);
- fs_info->stripesize = btrfs_super_stripesize(disk_super);
+ fs_info->stripesize = btrfs_stack_super_stripesize(disk_super);
ret = btrfs_check_fs_compatibility(disk_super, OPEN_CTREE_WRITES);
if (ret)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 7320bc28..1a92a8dd 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -400,7 +400,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("leafsize (deprecated)\t\t%u\n",
le32_to_cpu(sb->__unused_leafsize));
printf("stripesize\t\t%llu\n",
- (unsigned long long)btrfs_super_stripesize(sb));
+ (unsigned long long)btrfs_stack_super_stripesize(sb));
printf("root_dir\t\t%llu\n",
(unsigned long long)btrfs_super_root_dir(sb));
printf("num_devices\t\t%llu\n",
diff --git a/convert/common.c b/convert/common.c
index 81fe80df..b83bfbcd 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -130,7 +130,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg,
btrfs_set_stack_super_sectorsize(super, cfg->sectorsize);
super->__unused_leafsize = cpu_to_le32(cfg->nodesize);
btrfs_set_stack_super_nodesize(super, cfg->nodesize);
- btrfs_set_super_stripesize(super, cfg->stripesize);
+ btrfs_set_stack_super_stripesize(super, cfg->stripesize);
btrfs_set_super_csum_type(super, BTRFS_CSUM_TYPE_CRC32);
btrfs_set_stack_super_chunk_root(super, chunk_bytenr);
btrfs_set_super_cache_generation(super, -1);
diff --git a/ctree.h b/ctree.h
index a8bad6f2..ccad87e8 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2192,7 +2192,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_sectorsize, struct btrfs_super_block,
sectorsize, 32);
BTRFS_SETGET_STACK_FUNCS(stack_super_nodesize, struct btrfs_super_block,
nodesize, 32);
-BTRFS_SETGET_STACK_FUNCS(super_stripesize, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_stripesize, struct btrfs_super_block,
stripesize, 32);
BTRFS_SETGET_STACK_FUNCS(super_root_dir, struct btrfs_super_block,
root_dir_objectid, 64);
diff --git a/disk-io.c b/disk-io.c
index d17c4163..16fb9afd 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1164,7 +1164,7 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path,
memcpy(fs_info->fsid, &disk_super->fsid, BTRFS_FSID_SIZE);
fs_info->sectorsize = btrfs_stack_super_sectorsize(disk_super);
fs_info->nodesize = btrfs_stack_super_nodesize(disk_super);
- fs_info->stripesize = btrfs_super_stripesize(disk_super);
+ fs_info->stripesize = btrfs_stack_super_stripesize(disk_super);
ret = btrfs_check_fs_compatibility(fs_info->super_copy, flags);
if (ret)
@@ -1369,10 +1369,11 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
btrfs_stack_super_bytes_used(sb));
goto error_out;
}
- if ((btrfs_super_stripesize(sb) != 4096)
- && (btrfs_super_stripesize(sb) !=
+ if ((btrfs_stack_super_stripesize(sb) != 4096)
+ && (btrfs_stack_super_stripesize(sb) !=
btrfs_stack_super_sectorsize(sb))) {
- error("invalid stripesize %u", btrfs_super_stripesize(sb));
+ error("invalid stripesize %u",
+ btrfs_stack_super_stripesize(sb));
goto error_out;
}
diff --git a/mkfs/common.c b/mkfs/common.c
index d51f2e15..6a8fdb19 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -169,7 +169,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_stack_super_sectorsize(&super, cfg->sectorsize);
super.__unused_leafsize = cpu_to_le32(cfg->nodesize);
btrfs_set_stack_super_nodesize(&super, cfg->nodesize);
- btrfs_set_super_stripesize(&super, cfg->stripesize);
+ btrfs_set_stack_super_stripesize(&super, cfg->stripesize);
btrfs_set_super_csum_type(&super, BTRFS_CSUM_TYPE_CRC32);
btrfs_set_stack_super_chunk_root_generation(&super, 1);
btrfs_set_super_cache_generation(&super, -1);
diff --git a/volumes.c b/volumes.c
index 95480f41..5df064b3 100644
--- a/volumes.c
+++ b/volumes.c
@@ -938,7 +938,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
return -ENOSPC;
min_stripes = 2;
stripe_len = find_raid56_stripe_len(num_stripes - 1,
- btrfs_super_stripesize(info->super_copy));
+ btrfs_stack_super_stripesize(info->super_copy));
}
if (type & (BTRFS_BLOCK_GROUP_RAID6)) {
num_stripes = btrfs_super_num_devices(info->super_copy);
@@ -948,7 +948,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
return -ENOSPC;
min_stripes = 3;
stripe_len = find_raid56_stripe_len(num_stripes - 2,
- btrfs_super_stripesize(info->super_copy));
+ btrfs_stack_super_stripesize(info->super_copy));
}
/* we don't want a chunk larger than 10% of the FS */
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 59/67] btrfs-progs: add the stack prefix for super_root_dir set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (57 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 58/67] btrfs-progs: add the stack prefix for super_stripesize " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 60/67] btrfs-progs: add the stack prefix for super_num_devices " Lu Fengqi
` (8 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_root_dir set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
convert/main.c | 6 +++---
ctree.h | 2 +-
dir-test.c | 2 +-
mkfs/main.c | 2 +-
utils.c | 3 ++-
6 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 1a92a8dd..cbeef769 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -402,7 +402,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("stripesize\t\t%llu\n",
(unsigned long long)btrfs_stack_super_stripesize(sb));
printf("root_dir\t\t%llu\n",
- (unsigned long long)btrfs_super_root_dir(sb));
+ (unsigned long long)btrfs_stack_super_root_dir(sb));
printf("num_devices\t\t%llu\n",
(unsigned long long)btrfs_super_num_devices(sb));
printf("compat_flags\t\t0x%llx\n",
diff --git a/convert/main.c b/convert/main.c
index 66b839e2..8b2c61a5 100644
--- a/convert/main.c
+++ b/convert/main.c
@@ -972,13 +972,13 @@ static int init_btrfs(struct btrfs_mkfs_config *cfg, struct btrfs_root *root,
memcpy(&location, &root->root_key, sizeof(location));
location.offset = (u64)-1;
ret = btrfs_insert_dir_item(trans, fs_info->tree_root, "default", 7,
- btrfs_super_root_dir(fs_info->super_copy),
+ btrfs_stack_super_root_dir(fs_info->super_copy),
&location, BTRFS_FT_DIR, 0);
if (ret)
goto err;
ret = btrfs_insert_inode_ref(trans, fs_info->tree_root, "default", 7,
- location.objectid,
- btrfs_super_root_dir(fs_info->super_copy), 0);
+ location.objectid,
+ btrfs_stack_super_root_dir(fs_info->super_copy), 0);
if (ret)
goto err;
btrfs_set_stack_root_dirid(&fs_info->fs_root->root_item,
diff --git a/ctree.h b/ctree.h
index ccad87e8..ccc97125 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2194,7 +2194,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_nodesize, struct btrfs_super_block,
nodesize, 32);
BTRFS_SETGET_STACK_FUNCS(stack_super_stripesize, struct btrfs_super_block,
stripesize, 32);
-BTRFS_SETGET_STACK_FUNCS(super_root_dir, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_root_dir, struct btrfs_super_block,
root_dir_objectid, 64);
BTRFS_SETGET_STACK_FUNCS(super_num_devices, struct btrfs_super_block,
num_devices, 64);
diff --git a/dir-test.c b/dir-test.c
index 8fb23b82..15c83aaf 100644
--- a/dir-test.c
+++ b/dir-test.c
@@ -445,7 +445,7 @@ int main(int ac, char **av)
trans = btrfs_start_transaction(root, 1);
BUG_ON(IS_ERR(trans));
- dir_oid = btrfs_super_root_dir(&super);
+ dir_oid = btrfs_stack_super_root_dir(&super);
signal(SIGTERM, sigstopper);
signal(SIGINT, sigstopper);
diff --git a/mkfs/main.c b/mkfs/main.c
index 5cf265ea..51e176c4 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -183,7 +183,7 @@ static int make_root_dir(struct btrfs_trans_handle *trans,
location.offset = (u64)-1;
ret = btrfs_insert_dir_item(trans, root->fs_info->tree_root,
"default", 7,
- btrfs_super_root_dir(root->fs_info->super_copy),
+ btrfs_stack_super_root_dir(root->fs_info->super_copy),
&location, BTRFS_FT_DIR, 0);
if (ret)
goto err;
diff --git a/utils.c b/utils.c
index 6787efa1..150623fc 100644
--- a/utils.c
+++ b/utils.c
@@ -393,7 +393,8 @@ int btrfs_make_root_dir(struct btrfs_trans_handle *trans,
btrfs_set_stack_timespec_nsec(&inode_item.otime, 0);
if (root->fs_info->tree_root == root)
- btrfs_set_super_root_dir(root->fs_info->super_copy, objectid);
+ btrfs_set_stack_super_root_dir(root->fs_info->super_copy,
+ objectid);
ret = btrfs_insert_inode(trans, root, objectid, &inode_item);
if (ret)
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 60/67] btrfs-progs: add the stack prefix for super_num_devices set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (58 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 59/67] btrfs-progs: add the stack prefix for super_root_dir " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 61/67] btrfs-progs: add the stack prefix for super_compat_flags " Lu Fengqi
` (7 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_num_devices set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
convert/common.c | 2 +-
ctree.h | 2 +-
disk-io.c | 6 +++---
image/main.c | 4 ++--
mkfs/common.c | 2 +-
utils.c | 4 ++--
volumes.c | 14 +++++++-------
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index cbeef769..7308b476 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -404,7 +404,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("root_dir\t\t%llu\n",
(unsigned long long)btrfs_stack_super_root_dir(sb));
printf("num_devices\t\t%llu\n",
- (unsigned long long)btrfs_super_num_devices(sb));
+ (unsigned long long)btrfs_stack_super_num_devices(sb));
printf("compat_flags\t\t0x%llx\n",
(unsigned long long)btrfs_super_compat_flags(sb));
printf("compat_ro_flags\t\t0x%llx\n",
diff --git a/convert/common.c b/convert/common.c
index b83bfbcd..ce32e96e 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -115,7 +115,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg,
uuid_unparse(chunk_uuid, cfg->chunk_uuid);
btrfs_set_stack_super_bytenr(super, cfg->super_bytenr);
- btrfs_set_super_num_devices(super, 1);
+ btrfs_set_stack_super_num_devices(super, 1);
btrfs_set_super_magic(super, BTRFS_MAGIC_PARTIAL);
btrfs_set_stack_super_generation(super, 1);
btrfs_set_stack_super_root(super, root_bytenr);
diff --git a/ctree.h b/ctree.h
index ccc97125..41b5785d 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2196,7 +2196,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_stripesize, struct btrfs_super_block,
stripesize, 32);
BTRFS_SETGET_STACK_FUNCS(stack_super_root_dir, struct btrfs_super_block,
root_dir_objectid, 64);
-BTRFS_SETGET_STACK_FUNCS(super_num_devices, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_num_devices, struct btrfs_super_block,
num_devices, 64);
BTRFS_SETGET_STACK_FUNCS(super_compat_flags, struct btrfs_super_block,
compat_flags, 64);
diff --git a/disk-io.c b/disk-io.c
index 16fb9afd..d6bc057b 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1391,12 +1391,12 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
/*
* Hint to catch really bogus numbers, bitflips or so
*/
- if (btrfs_super_num_devices(sb) > (1UL << 31)) {
+ if (btrfs_stack_super_num_devices(sb) > (1UL << 31)) {
warning("suspicious number of devices: %llu",
- btrfs_super_num_devices(sb));
+ btrfs_stack_super_num_devices(sb));
}
- if (btrfs_super_num_devices(sb) == 0) {
+ if (btrfs_stack_super_num_devices(sb) == 0) {
error("number of devices is 0");
goto error_out;
}
diff --git a/image/main.c b/image/main.c
index 1a77de98..69fca3c3 100644
--- a/image/main.c
+++ b/image/main.c
@@ -1190,7 +1190,7 @@ static int update_super(struct mdrestore_struct *mdres, u8 *buffer)
flags |= BTRFS_SUPER_FLAG_METADUMP_V2;
btrfs_set_stack_super_flags(super, flags);
btrfs_set_stack_super_sys_array_size(super, new_array_size);
- btrfs_set_super_num_devices(super, 1);
+ btrfs_set_stack_super_num_devices(super, 1);
csum_block(buffer, BTRFS_SUPER_INFO_SIZE);
return 0;
@@ -2574,7 +2574,7 @@ int main(int argc, char *argv[])
return 1;
}
- total_devs = btrfs_super_num_devices(info->super_copy);
+ total_devs = btrfs_stack_super_num_devices(info->super_copy);
if (total_devs != dev_cnt) {
error("it needs %llu devices but has only %d",
total_devs, dev_cnt);
diff --git a/mkfs/common.c b/mkfs/common.c
index 6a8fdb19..1d259da5 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -159,7 +159,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
}
btrfs_set_stack_super_bytenr(&super, cfg->blocks[MKFS_SUPER_BLOCK]);
- btrfs_set_super_num_devices(&super, 1);
+ btrfs_set_stack_super_num_devices(&super, 1);
btrfs_set_super_magic(&super, BTRFS_MAGIC_PARTIAL);
btrfs_set_stack_super_generation(&super, 1);
btrfs_set_stack_super_root(&super, cfg->blocks[MKFS_ROOT_TREE]);
diff --git a/utils.c b/utils.c
index 150623fc..79fa04ad 100644
--- a/utils.c
+++ b/utils.c
@@ -232,8 +232,8 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
device_total_bytes;
btrfs_set_stack_super_total_bytes(super, fs_total_bytes);
- num_devs = btrfs_super_num_devices(super) + 1;
- btrfs_set_super_num_devices(super, num_devs);
+ num_devs = btrfs_stack_super_num_devices(super) + 1;
+ btrfs_set_stack_super_num_devices(super, num_devs);
memcpy(disk_super, super, sizeof(*disk_super));
diff --git a/volumes.c b/volumes.c
index 5df064b3..5d500640 100644
--- a/volumes.c
+++ b/volumes.c
@@ -129,7 +129,7 @@ static int device_list_add(const char *path,
kfree(device);
return -ENOMEM;
}
- device->total_devs = btrfs_super_num_devices(disk_super);
+ device->total_devs = btrfs_stack_super_num_devices(disk_super);
device->super_bytes_used =
btrfs_stack_super_bytes_used(disk_super);
device->total_bytes =
@@ -289,7 +289,7 @@ int btrfs_scan_one_device(int fd, const char *path,
if (btrfs_stack_super_flags(disk_super) & BTRFS_SUPER_FLAG_METADUMP)
*total_devs = 1;
else
- *total_devs = btrfs_super_num_devices(disk_super);
+ *total_devs = btrfs_stack_super_num_devices(disk_super);
ret = device_list_add(path, disk_super, devid, fs_devices_ret);
@@ -905,7 +905,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
}
if (type & BTRFS_BLOCK_GROUP_RAID1) {
num_stripes = min_t(u64, 2,
- btrfs_super_num_devices(info->super_copy));
+ btrfs_stack_super_num_devices(info->super_copy));
if (num_stripes < 2)
return -ENOSPC;
min_stripes = 2;
@@ -915,13 +915,13 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
min_stripes = 2;
}
if (type & (BTRFS_BLOCK_GROUP_RAID0)) {
- num_stripes = btrfs_super_num_devices(info->super_copy);
+ num_stripes = btrfs_stack_super_num_devices(info->super_copy);
if (num_stripes > max_stripes)
num_stripes = max_stripes;
min_stripes = 2;
}
if (type & (BTRFS_BLOCK_GROUP_RAID10)) {
- num_stripes = btrfs_super_num_devices(info->super_copy);
+ num_stripes = btrfs_stack_super_num_devices(info->super_copy);
if (num_stripes > max_stripes)
num_stripes = max_stripes;
if (num_stripes < 4)
@@ -931,7 +931,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
min_stripes = 4;
}
if (type & (BTRFS_BLOCK_GROUP_RAID5)) {
- num_stripes = btrfs_super_num_devices(info->super_copy);
+ num_stripes = btrfs_stack_super_num_devices(info->super_copy);
if (num_stripes > max_stripes)
num_stripes = max_stripes;
if (num_stripes < 2)
@@ -941,7 +941,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
btrfs_stack_super_stripesize(info->super_copy));
}
if (type & (BTRFS_BLOCK_GROUP_RAID6)) {
- num_stripes = btrfs_super_num_devices(info->super_copy);
+ num_stripes = btrfs_stack_super_num_devices(info->super_copy);
if (num_stripes > max_stripes)
num_stripes = max_stripes;
if (num_stripes < 3)
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 61/67] btrfs-progs: add the stack prefix for super_compat_flags set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (59 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 60/67] btrfs-progs: add the stack prefix for super_num_devices " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 62/67] btrfs-progs: add the stack prefix for super_compat_ro_flags " Lu Fengqi
` (6 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_compat_flags set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
ctree.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 7308b476..24037125 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -406,7 +406,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("num_devices\t\t%llu\n",
(unsigned long long)btrfs_stack_super_num_devices(sb));
printf("compat_flags\t\t0x%llx\n",
- (unsigned long long)btrfs_super_compat_flags(sb));
+ (unsigned long long)btrfs_stack_super_compat_flags(sb));
printf("compat_ro_flags\t\t0x%llx\n",
(unsigned long long)btrfs_super_compat_ro_flags(sb));
print_readable_compat_ro_flag(btrfs_super_compat_ro_flags(sb));
diff --git a/ctree.h b/ctree.h
index 41b5785d..c18b5577 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2198,7 +2198,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_root_dir, struct btrfs_super_block,
root_dir_objectid, 64);
BTRFS_SETGET_STACK_FUNCS(stack_super_num_devices, struct btrfs_super_block,
num_devices, 64);
-BTRFS_SETGET_STACK_FUNCS(super_compat_flags, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_compat_flags, struct btrfs_super_block,
compat_flags, 64);
BTRFS_SETGET_STACK_FUNCS(super_compat_ro_flags, struct btrfs_super_block,
compat_ro_flags, 64);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 62/67] btrfs-progs: add the stack prefix for super_compat_ro_flags set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (60 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 61/67] btrfs-progs: add the stack prefix for super_compat_flags " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 63/67] btrfs-progs: add the stack prefix for super_incompat_flags " Lu Fengqi
` (5 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_compat_ro_flags set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 4 ++--
ctree.h | 4 ++--
disk-io.c | 4 ++--
free-space-tree.c | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 24037125..8c51b6f0 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -408,8 +408,8 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("compat_flags\t\t0x%llx\n",
(unsigned long long)btrfs_stack_super_compat_flags(sb));
printf("compat_ro_flags\t\t0x%llx\n",
- (unsigned long long)btrfs_super_compat_ro_flags(sb));
- print_readable_compat_ro_flag(btrfs_super_compat_ro_flags(sb));
+ (unsigned long long)btrfs_stack_super_compat_ro_flags(sb));
+ print_readable_compat_ro_flag(btrfs_stack_super_compat_ro_flags(sb));
printf("incompat_flags\t\t0x%llx\n",
(unsigned long long)btrfs_super_incompat_flags(sb));
print_readable_incompat_flag(btrfs_super_incompat_flags(sb));
diff --git a/ctree.h b/ctree.h
index c18b5577..14f2e732 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2200,7 +2200,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_num_devices, struct btrfs_super_block,
num_devices, 64);
BTRFS_SETGET_STACK_FUNCS(stack_super_compat_flags, struct btrfs_super_block,
compat_flags, 64);
-BTRFS_SETGET_STACK_FUNCS(super_compat_ro_flags, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_compat_ro_flags, struct btrfs_super_block,
compat_ro_flags, 64);
BTRFS_SETGET_STACK_FUNCS(super_incompat_flags, struct btrfs_super_block,
incompat_flags, 64);
@@ -2458,7 +2458,7 @@ static inline int __btrfs_fs_compat_ro(struct btrfs_fs_info *fs_info, u64 flag)
{
struct btrfs_super_block *disk_super;
disk_super = fs_info->super_copy;
- return !!(btrfs_super_compat_ro_flags(disk_super) & flag);
+ return !!(btrfs_stack_super_compat_ro_flags(disk_super) & flag);
}
/* helper function to cast into the data area of the leaf. */
diff --git a/disk-io.c b/disk-io.c
index d6bc057b..6f8f9e87 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -770,12 +770,12 @@ int btrfs_check_fs_compatibility(struct btrfs_super_block *sb,
btrfs_set_super_incompat_flags(sb, features);
}
- features = btrfs_super_compat_ro_flags(sb);
+ features = btrfs_stack_super_compat_ro_flags(sb);
if (flags & OPEN_CTREE_WRITES) {
if (flags & OPEN_CTREE_INVALIDATE_FST) {
/* Clear the FREE_SPACE_TREE_VALID bit on disk... */
features &= ~BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE_VALID;
- btrfs_set_super_compat_ro_flags(sb, features);
+ btrfs_set_stack_super_compat_ro_flags(sb, features);
/* ... and ignore the free space tree bit. */
features &= ~BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE;
}
diff --git a/free-space-tree.c b/free-space-tree.c
index 69a4eca8..4a87b5be 100644
--- a/free-space-tree.c
+++ b/free-space-tree.c
@@ -119,10 +119,10 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info)
if (IS_ERR(trans))
return PTR_ERR(trans);
- features = btrfs_super_compat_ro_flags(fs_info->super_copy);
+ features = btrfs_stack_super_compat_ro_flags(fs_info->super_copy);
features &= ~(BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE_VALID |
BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE);
- btrfs_set_super_compat_ro_flags(fs_info->super_copy, features);
+ btrfs_set_stack_super_compat_ro_flags(fs_info->super_copy, features);
fs_info->free_space_root = NULL;
ret = clear_free_space_tree(trans, free_space_root);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 63/67] btrfs-progs: add the stack prefix for super_incompat_flags set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (61 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 62/67] btrfs-progs: add the stack prefix for super_compat_ro_flags " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 64/67] btrfs-progs: add the stack prefix for super_csum_type " Lu Fengqi
` (4 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_incompat_flags set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfstune.c | 4 ++--
cmds-inspect-dump-super.c | 4 ++--
convert/common.c | 2 +-
ctree.h | 4 ++--
disk-io.c | 6 +++---
mkfs/common.c | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/btrfstune.c b/btrfstune.c
index e502126a..daf7b22a 100644
--- a/btrfstune.c
+++ b/btrfstune.c
@@ -81,11 +81,11 @@ static int set_super_incompat_flags(struct btrfs_root *root, u64 flags)
int ret;
disk_super = root->fs_info->super_copy;
- super_flags = btrfs_super_incompat_flags(disk_super);
+ super_flags = btrfs_stack_super_incompat_flags(disk_super);
super_flags |= flags;
trans = btrfs_start_transaction(root, 1);
BUG_ON(IS_ERR(trans));
- btrfs_set_super_incompat_flags(disk_super, super_flags);
+ btrfs_set_stack_super_incompat_flags(disk_super, super_flags);
ret = btrfs_commit_transaction(trans, root);
return ret;
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 8c51b6f0..dd6e68fb 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -411,8 +411,8 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
(unsigned long long)btrfs_stack_super_compat_ro_flags(sb));
print_readable_compat_ro_flag(btrfs_stack_super_compat_ro_flags(sb));
printf("incompat_flags\t\t0x%llx\n",
- (unsigned long long)btrfs_super_incompat_flags(sb));
- print_readable_incompat_flag(btrfs_super_incompat_flags(sb));
+ (unsigned long long)btrfs_stack_super_incompat_flags(sb));
+ print_readable_incompat_flag(btrfs_stack_super_incompat_flags(sb));
printf("cache_generation\t%llu\n",
(unsigned long long)btrfs_super_cache_generation(sb));
printf("uuid_tree_generation\t%llu\n",
diff --git a/convert/common.c b/convert/common.c
index ce32e96e..97e9938d 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -134,7 +134,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg,
btrfs_set_super_csum_type(super, BTRFS_CSUM_TYPE_CRC32);
btrfs_set_stack_super_chunk_root(super, chunk_bytenr);
btrfs_set_super_cache_generation(super, -1);
- btrfs_set_super_incompat_flags(super, cfg->features);
+ btrfs_set_stack_super_incompat_flags(super, cfg->features);
if (cfg->label)
__strncpy_null(super->label, cfg->label, BTRFS_LABEL_SIZE - 1);
diff --git a/ctree.h b/ctree.h
index 14f2e732..2f1a6be4 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2202,7 +2202,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_compat_flags, struct btrfs_super_block,
compat_flags, 64);
BTRFS_SETGET_STACK_FUNCS(stack_super_compat_ro_flags, struct btrfs_super_block,
compat_ro_flags, 64);
-BTRFS_SETGET_STACK_FUNCS(super_incompat_flags, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_incompat_flags, struct btrfs_super_block,
incompat_flags, 64);
BTRFS_SETGET_STACK_FUNCS(super_csum_type, struct btrfs_super_block,
csum_type, 16);
@@ -2448,7 +2448,7 @@ static inline int __btrfs_fs_incompat(struct btrfs_fs_info *fs_info, u64 flag)
{
struct btrfs_super_block *disk_super;
disk_super = fs_info->super_copy;
- return !!(btrfs_super_incompat_flags(disk_super) & flag);
+ return !!(btrfs_stack_super_incompat_flags(disk_super) & flag);
}
#define btrfs_fs_compat_ro(fs_info, opt) \
diff --git a/disk-io.c b/disk-io.c
index 6f8f9e87..c37a40e4 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -755,7 +755,7 @@ int btrfs_check_fs_compatibility(struct btrfs_super_block *sb,
{
u64 features;
- features = btrfs_super_incompat_flags(sb) &
+ features = btrfs_stack_super_incompat_flags(sb) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
printk("couldn't open because of unsupported "
@@ -764,10 +764,10 @@ int btrfs_check_fs_compatibility(struct btrfs_super_block *sb,
return -ENOTSUP;
}
- features = btrfs_super_incompat_flags(sb);
+ features = btrfs_stack_super_incompat_flags(sb);
if (!(features & BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF)) {
features |= BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF;
- btrfs_set_super_incompat_flags(sb, features);
+ btrfs_set_stack_super_incompat_flags(sb, features);
}
features = btrfs_stack_super_compat_ro_flags(sb);
diff --git a/mkfs/common.c b/mkfs/common.c
index 1d259da5..40f2a9f4 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -173,7 +173,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_super_csum_type(&super, BTRFS_CSUM_TYPE_CRC32);
btrfs_set_stack_super_chunk_root_generation(&super, 1);
btrfs_set_super_cache_generation(&super, -1);
- btrfs_set_super_incompat_flags(&super, cfg->features);
+ btrfs_set_stack_super_incompat_flags(&super, cfg->features);
if (cfg->label)
__strncpy_null(super.label, cfg->label, BTRFS_LABEL_SIZE - 1);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 64/67] btrfs-progs: add the stack prefix for super_csum_type set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (62 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 63/67] btrfs-progs: add the stack prefix for super_incompat_flags " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 65/67] btrfs-progs: add the stack prefix for super_cache_generation " Lu Fengqi
` (3 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_csum_type set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 2 +-
convert/common.c | 2 +-
ctree.h | 4 ++--
disk-io.c | 2 +-
mkfs/common.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index dd6e68fb..5e036536 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -320,7 +320,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
u32 csum_size;
u16 csum_type;
- csum_type = btrfs_super_csum_type(sb);
+ csum_type = btrfs_stack_super_csum_type(sb);
csum_size = BTRFS_CSUM_SIZE;
printf("csum_type\t\t%hu (", csum_type);
if (csum_type >= ARRAY_SIZE(btrfs_csum_sizes)) {
diff --git a/convert/common.c b/convert/common.c
index 97e9938d..925c7348 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -131,7 +131,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg,
super->__unused_leafsize = cpu_to_le32(cfg->nodesize);
btrfs_set_stack_super_nodesize(super, cfg->nodesize);
btrfs_set_stack_super_stripesize(super, cfg->stripesize);
- btrfs_set_super_csum_type(super, BTRFS_CSUM_TYPE_CRC32);
+ btrfs_set_stack_super_csum_type(super, BTRFS_CSUM_TYPE_CRC32);
btrfs_set_stack_super_chunk_root(super, chunk_bytenr);
btrfs_set_super_cache_generation(super, -1);
btrfs_set_stack_super_incompat_flags(super, cfg->features);
diff --git a/ctree.h b/ctree.h
index 2f1a6be4..8639d0c1 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2204,7 +2204,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_compat_ro_flags, struct btrfs_super_block,
compat_ro_flags, 64);
BTRFS_SETGET_STACK_FUNCS(stack_super_incompat_flags, struct btrfs_super_block,
incompat_flags, 64);
-BTRFS_SETGET_STACK_FUNCS(super_csum_type, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_csum_type, struct btrfs_super_block,
csum_type, 16);
BTRFS_SETGET_STACK_FUNCS(super_cache_generation, struct btrfs_super_block,
cache_generation, 64);
@@ -2214,7 +2214,7 @@ BTRFS_SETGET_STACK_FUNCS(super_magic, struct btrfs_super_block, magic, 64);
static inline int btrfs_super_csum_size(struct btrfs_super_block *s)
{
- int t = btrfs_super_csum_type(s);
+ int t = btrfs_stack_super_csum_type(s);
BUG_ON(t >= ARRAY_SIZE(btrfs_csum_sizes));
return btrfs_csum_sizes[t];
}
diff --git a/disk-io.c b/disk-io.c
index c37a40e4..11545e97 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1292,7 +1292,7 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
}
}
- csum_type = btrfs_super_csum_type(sb);
+ csum_type = btrfs_stack_super_csum_type(sb);
if (csum_type >= ARRAY_SIZE(btrfs_csum_sizes)) {
error("unsupported checksum algorithm %u", csum_type);
return -EIO;
diff --git a/mkfs/common.c b/mkfs/common.c
index 40f2a9f4..fcc3216f 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -170,7 +170,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
super.__unused_leafsize = cpu_to_le32(cfg->nodesize);
btrfs_set_stack_super_nodesize(&super, cfg->nodesize);
btrfs_set_stack_super_stripesize(&super, cfg->stripesize);
- btrfs_set_super_csum_type(&super, BTRFS_CSUM_TYPE_CRC32);
+ btrfs_set_stack_super_csum_type(&super, BTRFS_CSUM_TYPE_CRC32);
btrfs_set_stack_super_chunk_root_generation(&super, 1);
btrfs_set_super_cache_generation(&super, -1);
btrfs_set_stack_super_incompat_flags(&super, cfg->features);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 65/67] btrfs-progs: add the stack prefix for super_cache_generation set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (63 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 64/67] btrfs-progs: add the stack prefix for super_csum_type " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 66/67] btrfs-progs: add the stack prefix for super_uuid_tree_generation " Lu Fengqi
` (2 subsequent siblings)
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_cache_generation set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-check.c | 7 ++++---
cmds-inspect-dump-super.c | 2 +-
convert/common.c | 2 +-
ctree.h | 2 +-
image/main.c | 2 +-
mkfs/common.c | 2 +-
6 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/cmds-check.c b/cmds-check.c
index 6c7f9f76..982f9a0e 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -8646,9 +8646,10 @@ static int check_space_cache(struct btrfs_root *root)
int ret;
int error = 0;
- if (btrfs_super_cache_generation(root->fs_info->super_copy) != -1ULL &&
+ if (btrfs_stack_super_cache_generation(root->fs_info->super_copy) !=
+ -1ULL &&
btrfs_stack_super_generation(root->fs_info->super_copy) !=
- btrfs_super_cache_generation(root->fs_info->super_copy)) {
+ btrfs_stack_super_cache_generation(root->fs_info->super_copy)) {
printf("cache and super generation don't match, space cache "
"will be invalidated\n");
return 0;
@@ -14552,7 +14553,7 @@ static int clear_free_space_cache(struct btrfs_fs_info *fs_info)
error("failed to update super block cache generation");
return PTR_ERR(trans);
}
- btrfs_set_super_cache_generation(fs_info->super_copy, (u64)-1);
+ btrfs_set_stack_super_cache_generation(fs_info->super_copy, (u64)-1);
btrfs_commit_transaction(trans, fs_info->tree_root);
return ret;
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 5e036536..877b3b77 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -414,7 +414,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
(unsigned long long)btrfs_stack_super_incompat_flags(sb));
print_readable_incompat_flag(btrfs_stack_super_incompat_flags(sb));
printf("cache_generation\t%llu\n",
- (unsigned long long)btrfs_super_cache_generation(sb));
+ (unsigned long long)btrfs_stack_super_cache_generation(sb));
printf("uuid_tree_generation\t%llu\n",
(unsigned long long)btrfs_super_uuid_tree_generation(sb));
diff --git a/convert/common.c b/convert/common.c
index 925c7348..d5ae385f 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -133,7 +133,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg,
btrfs_set_stack_super_stripesize(super, cfg->stripesize);
btrfs_set_stack_super_csum_type(super, BTRFS_CSUM_TYPE_CRC32);
btrfs_set_stack_super_chunk_root(super, chunk_bytenr);
- btrfs_set_super_cache_generation(super, -1);
+ btrfs_set_stack_super_cache_generation(super, -1);
btrfs_set_stack_super_incompat_flags(super, cfg->features);
if (cfg->label)
__strncpy_null(super->label, cfg->label, BTRFS_LABEL_SIZE - 1);
diff --git a/ctree.h b/ctree.h
index 8639d0c1..a7aacf40 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2206,7 +2206,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_incompat_flags, struct btrfs_super_block,
incompat_flags, 64);
BTRFS_SETGET_STACK_FUNCS(stack_super_csum_type, struct btrfs_super_block,
csum_type, 16);
-BTRFS_SETGET_STACK_FUNCS(super_cache_generation, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_cache_generation, struct btrfs_super_block,
cache_generation, 64);
BTRFS_SETGET_STACK_FUNCS(super_uuid_tree_generation, struct btrfs_super_block,
uuid_tree_generation, 64);
diff --git a/image/main.c b/image/main.c
index 69fca3c3..dcf21025 100644
--- a/image/main.c
+++ b/image/main.c
@@ -1185,7 +1185,7 @@ static int update_super(struct mdrestore_struct *mdres, u8 *buffer)
}
if (mdres->clear_space_cache)
- btrfs_set_super_cache_generation(super, 0);
+ btrfs_set_stack_super_cache_generation(super, 0);
flags |= BTRFS_SUPER_FLAG_METADUMP_V2;
btrfs_set_stack_super_flags(super, flags);
diff --git a/mkfs/common.c b/mkfs/common.c
index fcc3216f..6046d449 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -172,7 +172,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_stack_super_stripesize(&super, cfg->stripesize);
btrfs_set_stack_super_csum_type(&super, BTRFS_CSUM_TYPE_CRC32);
btrfs_set_stack_super_chunk_root_generation(&super, 1);
- btrfs_set_super_cache_generation(&super, -1);
+ btrfs_set_stack_super_cache_generation(&super, -1);
btrfs_set_stack_super_incompat_flags(&super, cfg->features);
if (cfg->label)
__strncpy_null(super.label, cfg->label, BTRFS_LABEL_SIZE - 1);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 66/67] btrfs-progs: add the stack prefix for super_uuid_tree_generation set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (64 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 65/67] btrfs-progs: add the stack prefix for super_cache_generation " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-11 5:09 ` [PATCH 67/67] btrfs-progs: add the stack prefix for super_magic " Lu Fengqi
2018-01-23 14:29 ` [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get David Sterba
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_uuid_tree_generation set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
btrfs-find-root.c | 2 +-
cmds-inspect-dump-super.c | 2 +-
ctree.h | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/btrfs-find-root.c b/btrfs-find-root.c
index 08bf2781..42c9a60a 100644
--- a/btrfs-find-root.c
+++ b/btrfs-find-root.c
@@ -76,7 +76,7 @@ static void get_root_gen_and_level(u64 objectid, struct btrfs_fs_info *fs_info,
gen = btrfs_stack_super_log_root_transid(super);
break;
case BTRFS_UUID_TREE_OBJECTID:
- gen = btrfs_super_uuid_tree_generation(super);
+ gen = btrfs_stack_super_uuid_tree_generation(super);
break;
}
if (gen != (u64)-1) {
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 877b3b77..299426f2 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -416,7 +416,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("cache_generation\t%llu\n",
(unsigned long long)btrfs_stack_super_cache_generation(sb));
printf("uuid_tree_generation\t%llu\n",
- (unsigned long long)btrfs_super_uuid_tree_generation(sb));
+ (unsigned long long)btrfs_stack_super_uuid_tree_generation(sb));
uuid_unparse(sb->dev_item.uuid, buf);
printf("dev_item.uuid\t\t%s\n", buf);
diff --git a/ctree.h b/ctree.h
index a7aacf40..c85aef9b 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2208,7 +2208,8 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_csum_type, struct btrfs_super_block,
csum_type, 16);
BTRFS_SETGET_STACK_FUNCS(stack_super_cache_generation, struct btrfs_super_block,
cache_generation, 64);
-BTRFS_SETGET_STACK_FUNCS(super_uuid_tree_generation, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_uuid_tree_generation,
+ struct btrfs_super_block,
uuid_tree_generation, 64);
BTRFS_SETGET_STACK_FUNCS(super_magic, struct btrfs_super_block, magic, 64);
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* [PATCH 67/67] btrfs-progs: add the stack prefix for super_magic set/get function
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (65 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 66/67] btrfs-progs: add the stack prefix for super_uuid_tree_generation " Lu Fengqi
@ 2018-01-11 5:09 ` Lu Fengqi
2018-01-23 14:29 ` [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get David Sterba
67 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-11 5:09 UTC (permalink / raw)
To: linux-btrfs
The super_magic set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 4 ++--
convert/common.c | 2 +-
ctree.h | 3 ++-
disk-io.c | 8 ++++----
mkfs/common.c | 2 +-
utils.c | 4 ++--
6 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 299426f2..cd498d45 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -355,7 +355,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
s = (char *) &sb->magic;
for (i = 0; i < 8; i++)
putchar(isprint(s[i]) ? s[i] : '.');
- if (btrfs_super_magic(sb) == BTRFS_MAGIC)
+ if (btrfs_stack_super_magic(sb) == BTRFS_MAGIC)
printf(" [match]\n");
else
printf(" [DON'T MATCH]\n");
@@ -478,7 +478,7 @@ static int load_and_dump_sb(char *filename, int fd, u64 sb_bytenr, int full,
}
printf("superblock: bytenr=%llu, device=%s\n", sb_bytenr, filename);
printf("---------------------------------------------------------\n");
- if (btrfs_super_magic(sb) != BTRFS_MAGIC && !force) {
+ if (btrfs_stack_super_magic(sb) != BTRFS_MAGIC && !force) {
error("bad magic on superblock on %s at %llu",
filename, (unsigned long long)sb_bytenr);
} else {
diff --git a/convert/common.c b/convert/common.c
index d5ae385f..bc0cf67d 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -116,7 +116,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg,
btrfs_set_stack_super_bytenr(super, cfg->super_bytenr);
btrfs_set_stack_super_num_devices(super, 1);
- btrfs_set_super_magic(super, BTRFS_MAGIC_PARTIAL);
+ btrfs_set_stack_super_magic(super, BTRFS_MAGIC_PARTIAL);
btrfs_set_stack_super_generation(super, 1);
btrfs_set_stack_super_root(super, root_bytenr);
btrfs_set_stack_super_chunk_root(super, chunk_bytenr);
diff --git a/ctree.h b/ctree.h
index c85aef9b..6c27f5f1 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2211,7 +2211,8 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_cache_generation, struct btrfs_super_block,
BTRFS_SETGET_STACK_FUNCS(stack_super_uuid_tree_generation,
struct btrfs_super_block,
uuid_tree_generation, 64);
-BTRFS_SETGET_STACK_FUNCS(super_magic, struct btrfs_super_block, magic, 64);
+BTRFS_SETGET_STACK_FUNCS(stack_super_magic, struct btrfs_super_block, magic,
+ 64);
static inline int btrfs_super_csum_size(struct btrfs_super_block *s)
{
diff --git a/disk-io.c b/disk-io.c
index 11545e97..9b63ae2a 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1283,8 +1283,8 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
u16 csum_type;
int csum_size;
- if (btrfs_super_magic(sb) != BTRFS_MAGIC) {
- if (btrfs_super_magic(sb) == BTRFS_MAGIC_PARTIAL) {
+ if (btrfs_stack_super_magic(sb) != BTRFS_MAGIC) {
+ if (btrfs_stack_super_magic(sb) == BTRFS_MAGIC_PARTIAL) {
if (!(sbflags & SBREAD_PARTIAL)) {
error("superblock magic doesn't match");
return -EIO;
@@ -1477,7 +1477,7 @@ int btrfs_read_dev_super(int fd, struct btrfs_super_block *sb, u64 sb_bytenr,
if (btrfs_stack_super_bytenr(buf) != bytenr)
continue;
/* if magic is NULL, the device was removed */
- if (btrfs_super_magic(buf) == 0 && i == 0)
+ if (btrfs_stack_super_magic(buf) == 0 && i == 0)
break;
if (check_super(buf, sbflags))
continue;
@@ -1657,7 +1657,7 @@ int close_ctree_fs_info(struct btrfs_fs_info *fs_info)
}
if (fs_info->finalize_on_close) {
- btrfs_set_super_magic(fs_info->super_copy, BTRFS_MAGIC);
+ btrfs_set_stack_super_magic(fs_info->super_copy, BTRFS_MAGIC);
root->fs_info->finalize_on_close = 0;
ret = write_all_supers(fs_info);
if (ret)
diff --git a/mkfs/common.c b/mkfs/common.c
index 6046d449..824d9014 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -160,7 +160,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_stack_super_bytenr(&super, cfg->blocks[MKFS_SUPER_BLOCK]);
btrfs_set_stack_super_num_devices(&super, 1);
- btrfs_set_super_magic(&super, BTRFS_MAGIC_PARTIAL);
+ btrfs_set_stack_super_magic(&super, BTRFS_MAGIC_PARTIAL);
btrfs_set_stack_super_generation(&super, 1);
btrfs_set_stack_super_root(&super, cfg->blocks[MKFS_ROOT_TREE]);
btrfs_set_stack_super_chunk_root(&super, cfg->blocks[MKFS_CHUNK_TREE]);
diff --git a/utils.c b/utils.c
index 79fa04ad..0f4306b9 100644
--- a/utils.c
+++ b/utils.c
@@ -1045,8 +1045,8 @@ int btrfs_device_already_in_root(struct btrfs_root *root, int fd,
* Accept devices from the same filesystem, allow partially created
* structures.
*/
- if (btrfs_super_magic(disk_super) != BTRFS_MAGIC &&
- btrfs_super_magic(disk_super) != BTRFS_MAGIC_PARTIAL)
+ if (btrfs_stack_super_magic(disk_super) != BTRFS_MAGIC &&
+ btrfs_stack_super_magic(disk_super) != BTRFS_MAGIC_PARTIAL)
goto brelse;
if (!memcmp(disk_super->fsid, root->fs_info->super_copy->fsid,
--
2.15.1
^ permalink raw reply related [flat|nested] 70+ messages in thread* Re: [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get
2018-01-11 5:08 [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get Lu Fengqi
` (66 preceding siblings ...)
2018-01-11 5:09 ` [PATCH 67/67] btrfs-progs: add the stack prefix for super_magic " Lu Fengqi
@ 2018-01-23 14:29 ` David Sterba
2018-01-24 6:44 ` Lu Fengqi
67 siblings, 1 reply; 70+ messages in thread
From: David Sterba @ 2018-01-23 14:29 UTC (permalink / raw)
To: Lu Fengqi; +Cc: linux-btrfs
On Thu, Jan 11, 2018 at 01:08:32PM +0800, Lu Fengqi wrote:
> These set/get functions defined by BTRFS_SETGET_STACK_FUNCS macro is
> missing the prefix stack. I can't add an extent buffer version set/get
> function as the result of the function name conflict.
Why do you need to add the extent buffer set/get helpers?
The function names will become quite long after adding the _stack
string, so I'd rather be sure we really need it before changing the
names everywhere.
^ permalink raw reply [flat|nested] 70+ messages in thread* Re: [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get
2018-01-23 14:29 ` [PATCH 00/67] btrfs-progs: add the stack prefix for the set/get David Sterba
@ 2018-01-24 6:44 ` Lu Fengqi
0 siblings, 0 replies; 70+ messages in thread
From: Lu Fengqi @ 2018-01-24 6:44 UTC (permalink / raw)
To: dsterba, linux-btrfs
On Tue, Jan 23, 2018 at 03:29:50PM +0100, David Sterba wrote:
>On Thu, Jan 11, 2018 at 01:08:32PM +0800, Lu Fengqi wrote:
>> These set/get functions defined by BTRFS_SETGET_STACK_FUNCS macro is
>> missing the prefix stack. I can't add an extent buffer version set/get
>> function as the result of the function name conflict.
>
>Why do you need to add the extent buffer set/get helpers?
I just want to use the extent_buffer version set helper to set the
refs/flags of root_item. Of course, I can read_extent_buffer at first,
then use the stack version set helper, and write_extent_buffer at last.
>
>The function names will become quite long after adding the _stack
>string, so I'd rather be sure we really need it before changing the
>names everywhere.
Personally, I think we should follow the naming scheme to differentiate
between the stack version helper and the extent_buffer version helper
since we already have such a naming scheme.
>--
>To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
--
Thanks,
Lu
^ permalink raw reply [flat|nested] 70+ messages in thread