btrfs-progs: ctree.h: Deprecate unused limit flags
PATCH 1/2 btrfs-progs: ctree.h: Deprecate unused limit flags
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 <[email protected]>
--- ctree.h | 12 ++++++------ libbtrfsutil/btrfs.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-)
ctree.h +6 -6
@@ -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;
libbtrfsutil/btrfs.h +6 -6
@@ -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 */ +#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;
Signature · 1 line
2.19.1
PATCH 2/2 btrfs-progs: gitignore: Ignore compressed man pages
Just to Make "git status" more clean.
Signed-off-by Qu Wenruo <[email protected]>
--- .gitignore | 1 + 1 file changed, 1 insertion(+)
.gitignore +1 -0
@@ -67,6 +67,7 @@ /Documentation/Makefile /Documentation/*.html +/Documentation/*.gz /Documentation/btrfs-balance.8 /Documentation/btrfs-check.8 /Documentation/btrfs-convert.8
Signature · 1 line
2.19.1
Re: [PATCH 2/2] btrfs-progs: gitignore: Ignore compressed man pages
Quoted 3 lines · Qu Wenruo
Just to Make "git status" more clean.
Signed-off-by Qu Wenruo <[email protected]>
Please discard this one patch, as now we don't build .gz man pages anymore.
Quoted 17 lines
--- .gitignore | 1 + 1 file changed, 1 insertion(+).gitignore +1
-0@@ -67,6 +67,7 @@ /Documentation/Makefile /Documentation/*.html +/Documentation/*.gz /Documentation/btrfs-balance.8 /Documentation/btrfs-check.8 /Documentation/btrfs-convert.8
Quoted 44 lines · Qu Wenruo
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 <[email protected]>--- ctree.h | 12 ++++++------ libbtrfsutil/btrfs.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-)ctree.h +6
-6@@ -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;libbtrfsutil/btrfs.h +0
-0@@ -54,12 +54,12 @@ struct btrfs_ioctl_vol_args {* struct btrfs_qgroup_limit.flags * struct btrfs_qgroup_limit_item.flags */
libbtrfsutil/btrfs.h struct btrfs_ioctl_vol_args { · line 60
Quoted 10 lines
libbtrfsutil/btrfs.h +4
-6-#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.
Quoted 6 lines
libbtrfsutil/btrfs.h +2
-0+#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;