btrfs-progs: ioctl.h: update type annotations
authorDavid Sterba <dsterba@suse.cz>
Wed, 3 Jun 2015 14:52:05 +0000 (16:52 +0200)
committerDavid Sterba <dsterba@suse.cz>
Wed, 3 Jun 2015 17:33:44 +0000 (19:33 +0200)
Add the __user annotations to pointers in structures.

Signed-off-by: David Sterba <dsterba@suse.cz>
ioctl.h

diff --git a/ioctl.h b/ioctl.h
index 089789ea23f7aed602679ade399561177ecd2742..0ef0602ab42e0523e242f704519b7990927b6326 100644 (file)
--- a/ioctl.h
+++ b/ioctl.h
 extern "C" {
 #endif
 
+#ifndef __user
+#define __user
+#endif
+
 #define BTRFS_IOCTL_MAGIC 0x94
 #define BTRFS_VOL_NAME_MAX 255
 
@@ -77,7 +81,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];
        };
@@ -521,7 +525,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 */