All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
To: <linux-btrfs@vger.kernel.org>
Subject: [PATCH 53/67] btrfs-progs: add the stack prefix for super_log_root_level set/get function
Date: Thu, 11 Jan 2018 13:09:25 +0800	[thread overview]
Message-ID: <20180111050939.21251-54-lufq.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <20180111050939.21251-1-lufq.fnst@cn.fujitsu.com>

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




  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 ` [PATCH 07/67] btrfs-progs: add the stack prefix for root_generation " Lu Fengqi
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 ` Lu Fengqi [this message]
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-54-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.