btrfs: uapi/linux/btrfs.h migration, qgroup limit flags

The BTRFS_QGROUP_LIMIT_* flags are required to tell the kernel which
fields are valid when using the BTRFS_IOC_QGROUP_LIMIT ioctl.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 3beaa24aff9b97f57bead13e4ffcb3570344b28a..c228b39fbd155fffaa5099fd293bcf1dff362554 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1154,14 +1154,6 @@ struct btrfs_qgroup_info_item {
        __le64 excl_cmpr;
 } __attribute__ ((__packed__));
 
-/* flags definition for qgroup limits */
-#define BTRFS_QGROUP_LIMIT_MAX_RFER    (1ULL << 0)
-#define BTRFS_QGROUP_LIMIT_MAX_EXCL    (1ULL << 1)
-#define BTRFS_QGROUP_LIMIT_RSV_RFER    (1ULL << 2)
-#define BTRFS_QGROUP_LIMIT_RSV_EXCL    (1ULL << 3)
-#define BTRFS_QGROUP_LIMIT_RFER_CMPR   (1ULL << 4)
-#define BTRFS_QGROUP_LIMIT_EXCL_CMPR   (1ULL << 5)
-
 struct btrfs_qgroup_limit_item {
        /*
         * only updated when any of the other values change

diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
index 11eee3439994c61271d5911e811e5b6333777c65..9651af3c46a1986532fd830aece449350fc05ec1 100644 (file)
--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
@@ -41,7 +41,19 @@ struct btrfs_ioctl_vol_args {
 #define BTRFS_UUID_SIZE 16
 #define BTRFS_UUID_UNPARSED_SIZE       37
 
-#define BTRFS_QGROUP_INHERIT_SET_LIMITS        (1ULL << 0)
+/*
+ * flags definition for qgroup limits
+ *
+ * Used by:
+ * struct btrfs_qgroup_limit.flags
+ * struct btrfs_qgroup_limit_item.flags
+ */
+#define BTRFS_QGROUP_LIMIT_MAX_RFER    (1ULL << 0)
+#define BTRFS_QGROUP_LIMIT_MAX_EXCL    (1ULL << 1)
+#define BTRFS_QGROUP_LIMIT_RSV_RFER    (1ULL << 2)
+#define BTRFS_QGROUP_LIMIT_RSV_EXCL    (1ULL << 3)
+#define BTRFS_QGROUP_LIMIT_RFER_CMPR   (1ULL << 4)
+#define BTRFS_QGROUP_LIMIT_EXCL_CMPR   (1ULL << 5)
 
 struct btrfs_qgroup_limit {
        __u64   flags;
@@ -51,6 +63,14 @@ struct btrfs_qgroup_limit {
        __u64   rsv_excl;
 };
 
+/*
+ * flags definition for qgroup inheritance
+ *
+ * Used by:
+ * struct btrfs_qgroup_inherit.flags
+ */
+#define BTRFS_QGROUP_INHERIT_SET_LIMITS        (1ULL << 0)
+
 struct btrfs_qgroup_inherit {
        __u64   flags;
        __u64   num_qgroups;