btrfs: mpersify struct btrfs_ioctl_vol_args_v2

This complements commit v4.11-719-gfb0c609.

* btrfs.c (struct_btrfs_ioctl_vol_args_v2): New type.  Mpersify it.
(btrfs_print_qgroup_inherit): Change qgi_addr type to unsigned long.
(btrfs_ioctl): Replace struct btrfs_ioctl_vol_args_v2 with
struct_btrfs_ioctl_vol_args_v2.

diff --git a/btrfs.c b/btrfs.c
index 9c717684d3e3a68dc872f3e664436397989203a3..6d02cb2c960542f11400c73be1bbba9f36517d2b 100644 (file)
--- a/btrfs.c
+++ b/btrfs.c
@@ -32,6 +32,7 @@
 #include DEF_MPERS_TYPE(struct_btrfs_ioctl_dev_replace_args)
 #include DEF_MPERS_TYPE(struct_btrfs_ioctl_send_args)
 #include DEF_MPERS_TYPE(struct_btrfs_ioctl_received_subvol_args)
+#include DEF_MPERS_TYPE(struct_btrfs_ioctl_vol_args_v2)
 
 # include <linux/btrfs.h>
 
@@ -41,6 +42,8 @@ typedef struct btrfs_ioctl_send_args
        struct_btrfs_ioctl_send_args;
 typedef struct btrfs_ioctl_received_subvol_args
        struct_btrfs_ioctl_received_subvol_args;
+typedef struct btrfs_ioctl_vol_args_v2
+       struct_btrfs_ioctl_vol_args_v2;
 
 #endif /* HAVE_LINUX_BTRFS_H */
 
@@ -373,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 uint64_t qgi_addr)
+btrfs_print_qgroup_inherit(struct tcb *tcp, const unsigned long qgi_addr)
 {
        struct btrfs_qgroup_inherit inherit;
 
@@ -1294,7 +1297,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,
 
        case BTRFS_IOC_SNAP_CREATE_V2:
        case BTRFS_IOC_SUBVOL_CREATE_V2: { /* code is W, but is actually RW */
-               struct btrfs_ioctl_vol_args_v2 args;
+               struct_btrfs_ioctl_vol_args_v2 args;
 
                if (entering(tcp))
                        tprints(", ");
@@ -1313,11 +1316,11 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,
                        printflags64(btrfs_snap_flags_v2, args.flags,
                                     "BTRFS_SUBVOL_???");
                        if (args.flags & BTRFS_SUBVOL_QGROUP_INHERIT) {
-                               tprintf(", size=%" PRI__u64 ", qgroup_inherit=",
-                                       args.size);
+                               tprintf(", size=%llu, qgroup_inherit=",
+                                       (unsigned long long) args.size);
 
                                btrfs_print_qgroup_inherit(tcp,
-                                       (unsigned long)args.qgroup_inherit);
+                                       (unsigned long) args.qgroup_inherit);
                        }
                        tprintf(", name=");
                        print_quoted_string(args.name, sizeof(args.name),
@@ -1325,7 +1328,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,
                        tprints("}");
                        return 0;
                }
-               tprintf("{transid=%" PRI__u64 "}", args.transid);
+               tprintf("{transid=%llu}", (unsigned long long) args.transid);
                break;
        }