On Fri, Feb 27, 2015 at 8:26 AM, Qu Wenruo <[email protected]> wrote:
> Before this patch, qgroup show won't check btrfs qgroup status, so even
> the INCONSISTENT flags is set, user is not aware of it.
>
> This patch will include BTRFS_QGROUP_STATUS_ITEM in the search range and
> check the flag, if there is any flag meaning the inconsistence of qgroup
> data, info user.
>
> NOTE: There is several kernel bugs from INCONSISTENT flags is always set
> to RUNNING flags is not cleared until umount.
> So this warning will always be here if using a newer kernel fixing these
> bugs.
>
> Signed-off-by: Qu Wenruo <[email protected]>
> ---
> qgroup.c | 26 ++++++++++++++++++++++++--
> 1 file changed, 24 insertions(+), 2 deletions(-)
>
> diff --git a/qgroup.c b/qgroup.c
> index 7288365..4173846 100644
> --- a/qgroup.c
> +++ b/qgroup.c
> @@ -1016,6 +1016,20 @@ static void __filter_and_sort_qgroups(struct
> qgroup_lookup *all_qgroups,
> n = rb_prev(n);
> }
> }
> +
> +static inline void print_status_flag_warning(u64 flags)
> +{
> + if (!(flags & BTRFS_QGROUP_STATUS_FLAG_ON))
> + fprintf(stderr,
> + "WARNING: Quota disabled, qgroup data may be out of date\n");
> + else if (flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN)
> + fprintf(stderr,
> + "WARNING: Rescan is running, qgroup data may be incorrect\n");
Hi Qu, did you ran xfstests? Did btrfs/022 passed for you?
btrfs/022 47s ... - output mismatch (see
/home/fdmanana/git/hub/xfstests/results//btrfs/022.out.bad)
--- tests/btrfs/022.out 2014-11-17 20:59:51.178203000 +0000
+++ /home/fdmanana/git/hub/xfstests/results//btrfs/022.out.bad
2015-05-30 12:35:55.917146846 +0100
@@ -1,2 +1,3 @@
QA output created by 022
+WARNING: Rescan is running, qgroup data may be incorrect
Silence is golden
...
(Run 'diff -u tests/btrfs/022.out
/home/fdmanana/git/hub/xfstests/results//btrfs/022.out.bad' to see
the entire diff)
thanks
> + else if (flags & BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT)
> + fprintf(stderr,
> + "WARNING: Qgroup data inconsistent, rescan recommended\n");
> +}
> +
> static int __qgroups_search(int fd, struct qgroup_lookup *qgroup_lookup)
> {
> int ret;
> @@ -1039,7 +1053,7 @@ static int __qgroups_search(int fd, struct
> qgroup_lookup *qgroup_lookup)
>
> sk->tree_id = BTRFS_QUOTA_TREE_OBJECTID;
> sk->max_type = BTRFS_QGROUP_RELATION_KEY;
> - sk->min_type = BTRFS_QGROUP_INFO_KEY;
> + sk->min_type = BTRFS_QGROUP_STATUS_KEY;
> sk->max_objectid = (u64)-1;
> sk->max_offset = (u64)-1;
> sk->max_transid = (u64)-1;
> @@ -1070,7 +1084,15 @@ static int __qgroups_search(int fd, struct
> qgroup_lookup *qgroup_lookup)
> off);
> off += sizeof(*sh);
>
> - if (sh->type == BTRFS_QGROUP_INFO_KEY) {
> + if (sh->type == BTRFS_QGROUP_STATUS_KEY) {
> + struct btrfs_qgroup_status_item *si;
> + u64 flags;
> +
> + si = (struct btrfs_qgroup_status_item *)
> + (args.buf + off);
> + flags = btrfs_stack_qgroup_status_flags(si);
> + print_status_flag_warning(flags);
> + } else if (sh->type == BTRFS_QGROUP_INFO_KEY) {
> info = (struct btrfs_qgroup_info_item *)
> (args.buf + off);
> a1 = btrfs_stack_qgroup_info_generation(info);
> --
> 2.3.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Filipe David Manana,
"Reasonable men adapt themselves to the world.
Unreasonable men adapt the world to themselves.
That's why all progress depends on unreasonable men."
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
