Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 680834ca authored by David Sterba's avatar David Sterba
Browse files

Merge branch 'foreign/jeffm/uapi' into for-chris-4.7-20160516 

# Conflicts:
#	include/uapi/linux/btrfs.h
parents 36fac9e9 14b05c51

fs/btrfs/ctree.h

+1 −1013

File changed.

Preview size limit exceeded, changes collapsed.

fs/btrfs/volumes.h

+0 −46
Original line number Diff line number Diff line
@@ -357,52 +357,6 @@ struct map_lookup { 
#define map_lookup_size(n) (sizeof(struct map_lookup) + \

			    (sizeof(struct btrfs_bio_stripe) * (n)))



/*

 * Restriper's general type filter

 */

#define BTRFS_BALANCE_DATA		(1ULL << 0)

#define BTRFS_BALANCE_SYSTEM		(1ULL << 1)

#define BTRFS_BALANCE_METADATA		(1ULL << 2)



#define BTRFS_BALANCE_TYPE_MASK		(BTRFS_BALANCE_DATA |	    \

					 BTRFS_BALANCE_SYSTEM |	    \

					 BTRFS_BALANCE_METADATA)



#define BTRFS_BALANCE_FORCE		(1ULL << 3)

#define BTRFS_BALANCE_RESUME		(1ULL << 4)



/*

 * Balance filters

 */

#define BTRFS_BALANCE_ARGS_PROFILES	(1ULL << 0)

#define BTRFS_BALANCE_ARGS_USAGE	(1ULL << 1)

#define BTRFS_BALANCE_ARGS_DEVID	(1ULL << 2)

#define BTRFS_BALANCE_ARGS_DRANGE	(1ULL << 3)

#define BTRFS_BALANCE_ARGS_VRANGE	(1ULL << 4)

#define BTRFS_BALANCE_ARGS_LIMIT	(1ULL << 5)

#define BTRFS_BALANCE_ARGS_LIMIT_RANGE	(1ULL << 6)

#define BTRFS_BALANCE_ARGS_STRIPES_RANGE (1ULL << 7)

#define BTRFS_BALANCE_ARGS_USAGE_RANGE	(1ULL << 10)



#define BTRFS_BALANCE_ARGS_MASK			\

	(BTRFS_BALANCE_ARGS_PROFILES |		\

	 BTRFS_BALANCE_ARGS_USAGE |		\

	 BTRFS_BALANCE_ARGS_DEVID | 		\

	 BTRFS_BALANCE_ARGS_DRANGE |		\

	 BTRFS_BALANCE_ARGS_VRANGE |		\

	 BTRFS_BALANCE_ARGS_LIMIT |		\

	 BTRFS_BALANCE_ARGS_LIMIT_RANGE |	\

	 BTRFS_BALANCE_ARGS_STRIPES_RANGE |	\

	 BTRFS_BALANCE_ARGS_USAGE_RANGE)



/*

 * Profile changing flags.  When SOFT is set we won't relocate chunk if

 * it already has the target profile (even though it may be

 * half-filled).

 */

#define BTRFS_BALANCE_ARGS_CONVERT	(1ULL << 8)

#define BTRFS_BALANCE_ARGS_SOFT		(1ULL << 9)



struct btrfs_balance_args;

struct btrfs_balance_progress;

struct btrfs_balance_control {

include/uapi/linux/btrfs.h

+168 −5
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#define BTRFS_IOCTL_MAGIC 0x94

#define BTRFS_VOL_NAME_MAX 255

#define BTRFS_LABEL_SIZE 256



/* this should be 4k */

#define BTRFS_PATH_NAME_MAX 4087
@@ -33,9 +34,6 @@ struct btrfs_ioctl_vol_args { 


#define BTRFS_DEVICE_PATH_NAME_MAX 1024



#define BTRFS_SUBVOL_CREATE_ASYNC	(1ULL << 0)

#define BTRFS_SUBVOL_RDONLY		(1ULL << 1)

#define BTRFS_SUBVOL_QGROUP_INHERIT	(1ULL << 2)

#define BTRFS_DEVICE_SPEC_BY_ID		(1ULL << 3)



#define BTRFS_VOL_ARG_V2_FLAGS_SUPPORTED		\
@@ -48,7 +46,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;
@@ -58,6 +68,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;
@@ -72,6 +90,20 @@ struct btrfs_ioctl_qgroup_limit_args { 
	struct btrfs_qgroup_limit lim;

};



/*

 * flags for subvolumes

 *

 * Used by:

 * struct btrfs_ioctl_vol_args_v2.flags

 *

 * BTRFS_SUBVOL_RDONLY is also provided/consumed by the following ioctls:

 * - BTRFS_IOC_SUBVOL_GETFLAGS

 * - BTRFS_IOC_SUBVOL_SETFLAGS

 */

#define BTRFS_SUBVOL_CREATE_ASYNC	(1ULL << 0)

#define BTRFS_SUBVOL_RDONLY		(1ULL << 1)

#define BTRFS_SUBVOL_QGROUP_INHERIT	(1ULL << 2)



#define BTRFS_SUBVOL_NAME_MAX 4039

struct btrfs_ioctl_vol_args_v2 {

	__s64 fd;
@@ -201,6 +233,37 @@ struct btrfs_ioctl_fs_info_args { 
	__u64 reserved[122];			/* pad to 1k */

};



/*

 * feature flags

 *

 * Used by:

 * struct btrfs_ioctl_feature_flags

 */

#define BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE	(1ULL << 0)



#define BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF	(1ULL << 0)

#define BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL	(1ULL << 1)

#define BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS	(1ULL << 2)

#define BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO	(1ULL << 3)

/*

 * some patches floated around with a second compression method

 * lets save that incompat here for when they do get in

 * Note we don't actually support it, we're just reserving the

 * number

 */

#define BTRFS_FEATURE_INCOMPAT_COMPRESS_LZOv2	(1ULL << 4)



/*

 * older kernels tried to do bigger metadata blocks, but the

 * code was pretty buggy.  Lets not let them try anymore.

 */

#define BTRFS_FEATURE_INCOMPAT_BIG_METADATA	(1ULL << 5)



#define BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF	(1ULL << 6)

#define BTRFS_FEATURE_INCOMPAT_RAID56		(1ULL << 7)

#define BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA	(1ULL << 8)

#define BTRFS_FEATURE_INCOMPAT_NO_HOLES		(1ULL << 9)



struct btrfs_ioctl_feature_flags {

	__u64 compat_flags;

	__u64 compat_ro_flags;
@@ -265,6 +328,70 @@ struct btrfs_balance_progress { 
	__u64 completed;	/* # of chunks relocated so far */

};



/*

 * flags definition for balance

 *

 * Restriper's general type filter

 *

 * Used by:

 * btrfs_ioctl_balance_args.flags

 * btrfs_balance_control.flags (internal)

 */

#define BTRFS_BALANCE_DATA		(1ULL << 0)

#define BTRFS_BALANCE_SYSTEM		(1ULL << 1)

#define BTRFS_BALANCE_METADATA		(1ULL << 2)



#define BTRFS_BALANCE_TYPE_MASK		(BTRFS_BALANCE_DATA |	    \

					 BTRFS_BALANCE_SYSTEM |	    \

					 BTRFS_BALANCE_METADATA)



#define BTRFS_BALANCE_FORCE		(1ULL << 3)

#define BTRFS_BALANCE_RESUME		(1ULL << 4)



/*

 * flags definitions for per-type balance args

 *

 * Balance filters

 *

 * Used by:

 * struct btrfs_balance_args

 */

#define BTRFS_BALANCE_ARGS_PROFILES	(1ULL << 0)

#define BTRFS_BALANCE_ARGS_USAGE	(1ULL << 1)

#define BTRFS_BALANCE_ARGS_DEVID	(1ULL << 2)

#define BTRFS_BALANCE_ARGS_DRANGE	(1ULL << 3)

#define BTRFS_BALANCE_ARGS_VRANGE	(1ULL << 4)

#define BTRFS_BALANCE_ARGS_LIMIT	(1ULL << 5)

#define BTRFS_BALANCE_ARGS_LIMIT_RANGE	(1ULL << 6)

#define BTRFS_BALANCE_ARGS_STRIPES_RANGE (1ULL << 7)

#define BTRFS_BALANCE_ARGS_USAGE_RANGE	(1ULL << 10)



#define BTRFS_BALANCE_ARGS_MASK			\

	(BTRFS_BALANCE_ARGS_PROFILES |		\

	 BTRFS_BALANCE_ARGS_USAGE |		\

	 BTRFS_BALANCE_ARGS_DEVID | 		\

	 BTRFS_BALANCE_ARGS_DRANGE |		\

	 BTRFS_BALANCE_ARGS_VRANGE |		\

	 BTRFS_BALANCE_ARGS_LIMIT |		\

	 BTRFS_BALANCE_ARGS_LIMIT_RANGE |	\

	 BTRFS_BALANCE_ARGS_STRIPES_RANGE |	\

	 BTRFS_BALANCE_ARGS_USAGE_RANGE)



/*

 * Profile changing flags.  When SOFT is set we won't relocate chunk if

 * it already has the target profile (even though it may be

 * half-filled).

 */

#define BTRFS_BALANCE_ARGS_CONVERT	(1ULL << 8)

#define BTRFS_BALANCE_ARGS_SOFT		(1ULL << 9)





/*

 * flags definition for balance state

 *

 * Used by:

 * struct btrfs_ioctl_balance_args.state

 */

#define BTRFS_BALANCE_STATE_RUNNING	(1ULL << 0)

#define BTRFS_BALANCE_STATE_PAUSE_REQ	(1ULL << 1)

#define BTRFS_BALANCE_STATE_CANCEL_REQ	(1ULL << 2)
@@ -358,9 +485,45 @@ struct btrfs_ioctl_clone_range_args { 
  __u64 dest_offset;

};



/* flags for the defrag range ioctl */

/*

 * flags definition for the defrag range ioctl

 *

 * Used by:

 * struct btrfs_ioctl_defrag_range_args.flags

 */

#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];

};





#define BTRFS_SAME_DATA_DIFFERS	1

/* For extent-same ioctl */

include/uapi/linux/btrfs_tree.h

0 → 100644
+966 −0

File added.

Preview size limit exceeded, changes collapsed.