Update statx parser and syscall entries lists to the upstream

[strace] / btrfs.c

diff --git a/btrfs.c b/btrfs.c
index bd11cb0998b7046b7445a2315a8f5d8a4fca50be..e007040fd1fdc8209616c45cb55f165ed19f8687 100644 (file)
--- a/btrfs.c
+++ b/btrfs.c
@@ -204,7 +204,7 @@ btrfs_print_balance_args(const char *name, const struct btrfs_balance_args *bba)
 }
 
 static void
-btrfs_print_balance(struct tcb *tcp, const long arg, bool out)
+btrfs_print_balance(struct tcb *const tcp, const kernel_ulong_t arg, bool out)
 {
        struct btrfs_ioctl_balance_args balance_args;
 
@@ -376,7 +376,7 @@ print_uint64(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 }
 
 static void
-btrfs_print_qgroup_inherit(struct tcb *tcp, const unsigned long qgi_addr)
+btrfs_print_qgroup_inherit(struct tcb *const tcp, const kernel_ulong_t qgi_addr)
 {
        struct btrfs_qgroup_inherit inherit;
 
@@ -512,7 +512,8 @@ print_btrfs_ioctl_space_info(struct tcb *tcp, void *elem_buf,
 }
 
 MPERS_PRINTER_DECL(int, btrfs_ioctl,
-                  struct tcb *tcp, const unsigned int code, const long arg)
+                  struct tcb *const tcp, const unsigned int code,
+                  const kernel_ulong_t arg)
 {
        switch (code) {
        /* Take no arguments; command only. */
@@ -1216,7 +1217,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,
                        tprints("...");
                else {
                        uint64_t record;
-                       print_array(tcp, (kernel_ureg_t) args.clone_sources,
+                       print_array(tcp, ptr_to_kulong(args.clone_sources),
                                    args.clone_sources_count,
                                    &record, sizeof(record),
                                    umoven_or_printaddr,
@@ -1320,7 +1321,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,
                                        (uint64_t) args.size);
 
                                btrfs_print_qgroup_inherit(tcp,
-                                       (kernel_ureg_t) args.qgroup_inherit);
+                                       ptr_to_kulong(args.qgroup_inherit));
                        }
                        tprints(", name=");
                        print_quoted_string(args.name, sizeof(args.name),