On 13.11.18 г. 8:09 ч., Qu Wenruo wrote:
> BTRFS_QGROUP_LIMIT_RSV_RFER/EXCL are never used by btrfs-progs.
> And kernel only do the basic assignment but don't really make use of
> them.
>
> So deprecate these two flags in btrfs-progs.
> Also, add some comment for all the used flags.
>
> Signed-off-by: Qu Wenruo <w...@suse.com>
> ---
> ctree.h | 12 ++++++------
> libbtrfsutil/btrfs.h | 12 ++++++------
> 2 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/ctree.h b/ctree.h
> index 5d9ba3c555f1..1bbc5a2e9dee 100644
> --- a/ctree.h
> +++ b/ctree.h
> @@ -1038,12 +1038,12 @@ struct btrfs_qgroup_info_item {
> } __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)
> +#define BTRFS_QGROUP_LIMIT_MAX_RFER (1ULL << 0) /* reference (rfer) limit */
> +#define BTRFS_QGROUP_LIMIT_MAX_EXCL (1ULL << 1) /* exclusive (excl) limit */
> +#define __BTRFS_QGROUP_LIMIT_RSV_RFER (1ULL << 2) /* deprecated */
> +#define __BTRFS_QGROUP_LIMIT_RSV_EXCL (1ULL << 3) /* deprecated */
> +#define BTRFS_QGROUP_LIMIT_RFER_CMPR (1ULL << 4) /* compressed rfer limit */
> +#define BTRFS_QGROUP_LIMIT_EXCL_CMPR (1ULL << 5) /* compressed excl limit */
>
> struct btrfs_qgroup_limit_item {
> __le64 flags;
> diff --git a/libbtrfsutil/btrfs.h b/libbtrfsutil/btrfs.h
> index 1893c5a2172e..4e58a3cd167b 100644
> --- a/libbtrfsutil/btrfs.h
> +++ b/libbtrfsutil/btrfs.h
> @@ -54,12 +54,12 @@ struct btrfs_ioctl_vol_args {
> * 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)
> +#define BTRFS_QGROUP_LIMIT_MAX_RFER (1ULL << 0) /* reference (rfer) limit */
> +#define BTRFS_QGROUP_LIMIT_MAX_EXCL (1ULL << 1) /* exclusive (excl) limit */
> +#define __BTRFS_QGROUP_LIMIT_RSV_RFER (1ULL << 2) /* deprecated */
> +#define __BTRFS_QGROUP_LIMIT_RSV_EXCL (1ULL << 3) /* deprecated */
Same feedback as the kernel counterpart - just put the /* deprecated */
comment, let the kernel warning settle for a few releases (removing it
in the next one might be a bit optimistic) and then just remove it.
> +#define BTRFS_QGROUP_LIMIT_RFER_CMPR (1ULL << 4) /* compressed rfer limit */
> +#define BTRFS_QGROUP_LIMIT_EXCL_CMPR (1ULL << 5) /* compressed excl limit */
>
> struct btrfs_qgroup_limit {
> __u64 flags;
>
