glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs: print {min,max}_{offset,transid} unconditionally

Browse Source 
As it looks like there's no reason to skip their printing.

* btrfs.c (print_key_value_internal): Do not check value argument
for holding non-zero value.
* tests/btrfs.c (btrfs_print_search_key): Update expected output.
This commit is contained in:
Eugene Syromyatnikov 2018-03-17 10:32:59 +01:00 committed by Dmitry V. Levin
parent 2b71146c3a
commit 83e797d9dc
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
btrfs.c
View File

@ -393,12 +393,10 @@ btrfs_print_qgroup_inherit(struct tcb *const tcp, const kernel_ulong_t qgi_addr)
static void static void
print_key_value_internal(struct tcb *tcp, const char *name, uint64_t value) print_key_value_internal(struct tcb *tcp, const char *name, uint64_t value)
{ {
if (value) {
tprintf(", %s=%" PRIu64, name, value); tprintf(", %s=%" PRIu64, name, value);
if (value == UINT64_MAX) if (value == UINT64_MAX)
tprints_comment("UINT64_MAX"); tprints_comment("UINT64_MAX");
} }
}
#define print_key_value(tcp, key, name) \ #define print_key_value(tcp, key, name) \
print_key_value_internal((tcp), #name, (key)->name) print_key_value_internal((tcp), #name, (key)->name)

4
tests/btrfs.c
View File

@ -848,16 +848,12 @@ btrfs_print_search_key(struct btrfs_ioctl_search_key *key)
printf(", max_objectid="); printf(", max_objectid=");
btrfs_print_objectid(key->max_objectid); btrfs_print_objectid(key->max_objectid);
} }
if (key->min_offset)
printf(", min_offset=%" PRI__u64 "%s", printf(", min_offset=%" PRI__u64 "%s",
key->min_offset, maybe_print_uint64max(key->min_offset)); key->min_offset, maybe_print_uint64max(key->min_offset));
if (key->max_offset)
printf(", max_offset=%" PRI__u64 "%s", printf(", max_offset=%" PRI__u64 "%s",
key->max_offset, maybe_print_uint64max(key->max_offset)); key->max_offset, maybe_print_uint64max(key->max_offset));
if (key->min_transid)
printf(", min_transid=%" PRI__u64 "%s", key->min_transid, printf(", min_transid=%" PRI__u64 "%s", key->min_transid,
maybe_print_uint64max(key->min_transid)); maybe_print_uint64max(key->min_transid));
if (key->max_transid)
printf(", max_transid=%" PRI__u64 "%s", key->max_transid, printf(", max_transid=%" PRI__u64 "%s", key->max_transid,
maybe_print_uint64max(key->max_transid)); maybe_print_uint64max(key->max_transid));
printf(", min_type="); printf(", min_type=");