btrfs-progs: show-super: Add option to print superblock at given bytenr

[platform/upstream/btrfs-progs.git] / ioctl.h

diff --git a/ioctl.h b/ioctl.h
index 089789e..dff015a 100644 (file)
--- a/ioctl.h
+++ b/ioctl.h
@@ -19,12 +19,15 @@
 #ifndef __BTRFS_IOCTL_H__
 #define __BTRFS_IOCTL_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <asm/types.h>
 #include <linux/ioctl.h>
-#include <time.h>
 
-#ifdef __cplusplus
-extern "C" {
+#ifndef __user
+#define __user
 #endif
 
 #define BTRFS_IOCTL_MAGIC 0x94
@@ -77,7 +80,7 @@ struct btrfs_ioctl_vol_args_v2 {
        union {
                struct {
                        __u64 size;
-                       struct btrfs_qgroup_inherit *qgroup_inherit;
+                       struct btrfs_qgroup_inherit __user *qgroup_inherit;
                };
                __u64 unused[4];
        };
@@ -189,7 +192,17 @@ struct btrfs_ioctl_fs_info_args {
        __u64 max_id;                           /* out */
        __u64 num_devices;                      /* out */
        __u8 fsid[BTRFS_FSID_SIZE];             /* out */
-       __u64 reserved[124];                    /* pad to 1k */
+       __u32 nodesize;                         /* out */
+       __u32 sectorsize;                       /* out */
+       __u32 clone_alignment;                  /* out */
+       __u32 reserved32;
+       __u64 reserved[122];                    /* pad to 1k */
+};
+
+struct btrfs_ioctl_feature_flags {
+       __u64 compat_flags;
+       __u64 compat_ro_flags;
+       __u64 incompat_flags;
 };
 
 /* balance control ioctl modes */
@@ -521,7 +534,7 @@ struct btrfs_ioctl_received_subvol_args {
 struct btrfs_ioctl_send_args {
        __s64 send_fd;                  /* in */
        __u64 clone_sources_count;      /* in */
-       __u64 *clone_sources;           /* in */
+       __u64 __user *clone_sources;    /* in */
        __u64 parent_root;              /* in */
        __u64 flags;                    /* in */
        __u64 reserved[4];              /* in */