Merge branch 'rmobile/dma' into rmobile-fixes-for-linus

[firefly-linux-kernel-4.4.55.git] / fs / btrfs / ioctl.h

diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h
index 1a638ceeead8bbd9787ccc92c0d491beb4c53ca5..ad1ea789fcb4d281dcd80398bd75bbec2b1e30d9 100644 (file)
--- a/fs/btrfs/ioctl.h
+++ b/fs/btrfs/ioctl.h
@@ -81,6 +81,7 @@ struct btrfs_scrub_progress {
                                         * Intermittent error. */
 };
 
+#define BTRFS_SCRUB_READONLY   1
 struct btrfs_ioctl_scrub_args {
        __u64 devid;                            /* in */
        __u64 start;                            /* in */
@@ -180,37 +181,6 @@ struct btrfs_ioctl_clone_range_args {
 #define BTRFS_DEFRAG_RANGE_COMPRESS 1
 #define BTRFS_DEFRAG_RANGE_START_IO 2
 
-struct btrfs_ioctl_defrag_range_args {
-       /* start of the defrag operation */
-       __u64 start;
-
-       /* number of bytes to defrag, use (u64)-1 to say all */
-       __u64 len;
-
-       /*
-        * flags for the operation, which can include turning
-        * on compression for this one defrag
-        */
-       __u64 flags;
-
-       /*
-        * any extent bigger than this will be considered
-        * already defragged.  Use 0 to take the kernel default
-        * Use 1 to say every single extent must be rewritten
-        */
-       __u32 extent_thresh;
-
-       /*
-        * which compression method to use if turning on compression
-        * for this defrag operation.  If unspecified, zlib will
-        * be used
-        */
-       __u32 compress_type;
-
-       /* spare for later */
-       __u32 unused[4];
-};
-
 struct btrfs_ioctl_space_info {
        __u64 flags;
        __u64 total_bytes;