RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: Use unified function to implement print_readable_*_flag function 

Now add a new unified __print_readable_flag() function to implement
print_readable_incompat_flag().

This makes later extension for human readable flags easier.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Qu Wenruo 2015-05-11 16:08:43 +08:00 committed by David Sterba
parent 7cc792872a
commit b8436121c2
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
btrfs-show-super.c
View File

@ -305,7 +305,8 @@ struct readable_flag_entry incompat_flags_array[] = {
static const int incompat_flags_num = sizeof(incompat_flags_array) / static const int incompat_flags_num = sizeof(incompat_flags_array) /
sizeof(struct readable_flag_entry); sizeof(struct readable_flag_entry);
static void print_readable_incompat_flag(u64 flag) static void __print_readable_flag(u64 flag, struct readable_flag_entry *array,
int array_size, u64 supported_flags)
{ {
int i; int i;
int first = 1; int first = 1;
@ -313,9 +314,10 @@ static void print_readable_incompat_flag(u64 flag)
if (!flag) if (!flag)
return; return;
printf("\t\t\t( "); printf("\t\t\t( ");
for (i = 0; i < incompat_flags_num; i++) { for (i = 0; i < array_size; i++) {
entry = incompat_flags_array + i; entry = array + i;
if (flag & entry->bit) { if (flag & entry->bit) {
if (first) if (first)
printf("%s ", entry->output); printf("%s ", entry->output);
@ -324,7 +326,7 @@ static void print_readable_incompat_flag(u64 flag)
first = 0; first = 0;
} }
} }
flag &= ~BTRFS_FEATURE_INCOMPAT_SUPP; flag &= ~supported_flags;
if (flag) { if (flag) {
if (first) if (first)
printf("unknown flag: 0x%llx ", flag); printf("unknown flag: 0x%llx ", flag);
@ -334,6 +336,13 @@ static void print_readable_incompat_flag(u64 flag)
printf(")\n"); printf(")\n");
} }
static void print_readable_incompat_flag(u64 flag)
{
return __print_readable_flag(flag, incompat_flags_array,
incompat_flags_num,
BTRFS_FEATURE_INCOMPAT_SUPP);
}
static void dump_superblock(struct btrfs_super_block *sb, int full) static void dump_superblock(struct btrfs_super_block *sb, int full)
{ {
int i; int i;