From: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
To: <linux-btrfs@vger.kernel.org>
Subject: [PATCH 07/67] btrfs-progs: add the stack prefix for root_generation set/get function
Date: Thu, 11 Jan 2018 13:08:39 +0800 [thread overview]
Message-ID: <20180111050939.21251-8-lufq.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <20180111050939.21251-1-lufq.fnst@cn.fujitsu.com>
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
next prev parent reply other threads:[~2018-01-11 5:10 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` [PATCH 03/67] btrfs-progs: add the stack prefix for block_group_flags " Lu Fengqi
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 ` [PATCH 05/67] btrfs-progs: add the stack prefix for disk_key_offset " Lu Fengqi
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 [this message]
2018-01-11 5:08 ` [PATCH 08/67] btrfs-progs: add the stack prefix for root_bytenr " Lu Fengqi
2018-01-11 5:08 ` [PATCH 09/67] btrfs-progs: add the stack prefix for root_level " Lu Fengqi
2018-01-11 5:08 ` [PATCH 10/67] btrfs-progs: add the stack prefix for root_dirid " Lu Fengqi
2018-01-11 5:08 ` [PATCH 11/67] btrfs-progs: add the stack prefix for root_refs " Lu Fengqi
2018-01-11 5:08 ` [PATCH 12/67] btrfs-progs: add the stack prefix for root_flags " Lu Fengqi
2018-01-11 5:08 ` [PATCH 13/67] btrfs-progs: add the stack prefix for root_used " Lu Fengqi
2018-01-11 5:08 ` [PATCH 14/67] btrfs-progs: add the stack prefix for root_limit " Lu Fengqi
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 ` [PATCH 16/67] btrfs-progs: add the stack prefix for root_generation_v2 " Lu Fengqi
2018-01-11 5:08 ` [PATCH 17/67] btrfs-progs: add the stack prefix for root_ctransid " Lu Fengqi
2018-01-11 5:08 ` [PATCH 18/67] btrfs-progs: add the stack prefix for root_otransid " Lu Fengqi
2018-01-11 5:08 ` [PATCH 19/67] btrfs-progs: add the stack prefix for root_stransid " Lu Fengqi
2018-01-11 5:08 ` [PATCH 20/67] btrfs-progs: add the stack prefix for root_rtransid " Lu Fengqi
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 ` [PATCH 22/67] btrfs-progs: add the stack prefix for backup_tree_root_gen " Lu Fengqi
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 ` [PATCH 24/67] btrfs-progs: add the stack prefix for backup_chunk_root " Lu Fengqi
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 ` [PATCH 26/67] btrfs-progs: add the stack prefix for backup_chunk_root_level " Lu Fengqi
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 ` [PATCH 28/67] btrfs-progs: add the stack prefix for backup_extent_root_gen " Lu Fengqi
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 ` [PATCH 30/67] btrfs-progs: add the stack prefix for backup_fs_root " Lu Fengqi
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 ` [PATCH 32/67] btrfs-progs: add the stack prefix for backup_fs_root_level " Lu Fengqi
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 ` [PATCH 34/67] btrfs-progs: add the stack prefix for backup_dev_root_gen " Lu Fengqi
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 ` [PATCH 36/67] btrfs-progs: add the stack prefix for backup_csum_root " Lu Fengqi
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 ` [PATCH 38/67] btrfs-progs: add the stack prefix for backup_csum_root_level " Lu Fengqi
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 ` [PATCH 40/67] btrfs-progs: add the stack prefix for backup_bytes_used " Lu Fengqi
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 ` [PATCH 42/67] btrfs-progs: add the stack prefix for super_bytenr " Lu Fengqi
2018-01-11 5:09 ` [PATCH 43/67] btrfs-progs: add the stack prefix for super_flags " Lu Fengqi
2018-01-11 5:09 ` [PATCH 44/67] btrfs-progs: add the stack prefix for super_generation " Lu Fengqi
2018-01-11 5:09 ` [PATCH 45/67] btrfs-progs: add the stack prefix for super_root " Lu Fengqi
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 ` [PATCH 47/67] btrfs-progs: add the stack prefix for super_chunk_root_generation " Lu Fengqi
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 ` [PATCH 49/67] btrfs-progs: add the stack prefix for super_chunk_root " Lu Fengqi
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 ` [PATCH 51/67] btrfs-progs: add the stack prefix for super_log_root " Lu Fengqi
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 ` [PATCH 53/67] btrfs-progs: add the stack prefix for super_log_root_level " Lu Fengqi
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 ` [PATCH 55/67] btrfs-progs: add the stack prefix for super_bytes_used " Lu Fengqi
2018-01-11 5:09 ` [PATCH 56/67] btrfs-progs: add the stack prefix for super_sectorsize " Lu Fengqi
2018-01-11 5:09 ` [PATCH 57/67] btrfs-progs: add the stack prefix for super_nodesize " Lu Fengqi
2018-01-11 5:09 ` [PATCH 58/67] btrfs-progs: add the stack prefix for super_stripesize " Lu Fengqi
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 ` [PATCH 60/67] btrfs-progs: add the stack prefix for super_num_devices " Lu Fengqi
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 ` [PATCH 62/67] btrfs-progs: add the stack prefix for super_compat_ro_flags " Lu Fengqi
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 ` [PATCH 64/67] btrfs-progs: add the stack prefix for super_csum_type " Lu Fengqi
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 ` [PATCH 66/67] btrfs-progs: add the stack prefix for super_uuid_tree_generation " 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
2018-01-24 6:44 ` Lu Fengqi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180111050939.21251-8-lufq.fnst@cn.fujitsu.com \
--to=lufq.fnst@cn.fujitsu.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.