Re: [PATCH 4/8] btrfs-progs: simple quotas fsck

[Josef Bacik <josef@toxicpanda.com>]

On Wed, Jul 05, 2023 at 04:36:23PM -0700, Boris Burkov wrote:
> Add simple quotas checks to btrfs check.
> 
> Like the kernel feature, these checks bypass most of the backref walking
> in the qgroups check. Instead, they enforce the invariant behind the
> design of simple quotas by scanning the extent tree and determining the
> owner of each extent:
> Data: reading the owner ref inline item
> Metadata: reading the tree block and reading its btrfs_header's owner
> 
> This gives us the expected count from squotas which we check against the
> on-disk state of the qgroup items
> 
> Signed-off-by: Boris Burkov <boris@bur.io>
> ---
>  check/main.c          |   2 +
>  check/qgroup-verify.c | 122 ++++++++++++++++++++++++++++++++++--------
>  2 files changed, 102 insertions(+), 22 deletions(-)
> 
> diff --git a/check/main.c b/check/main.c
> index 77bb50a0e..07f31fbe0 100644
> --- a/check/main.c
> +++ b/check/main.c
> @@ -5667,6 +5667,8 @@ static int process_extent_item(struct btrfs_root *root,
>  					btrfs_shared_data_ref_count(eb, sref),
>  					gen, 0, num_bytes);
>  			break;
> +		case BTRFS_EXTENT_OWNER_REF_KEY:
> +			break;
>  		default:
>  			fprintf(stderr,
>  				"corrupt extent record: key [%llu,%u,%llu]\n",
> diff --git a/check/qgroup-verify.c b/check/qgroup-verify.c
> index 1a62009b8..0d079f3b7 100644
> --- a/check/qgroup-verify.c
> +++ b/check/qgroup-verify.c
> @@ -85,6 +85,8 @@ static struct counts_tree {
>  	unsigned int		num_groups;
>  	unsigned int		rescan_running:1;
>  	unsigned int		qgroup_inconsist:1;
> +	unsigned int        simple:1;
> +	u64         enable_gen;
>  	u64			scan_progress;
>  } counts = { .root = RB_ROOT };
>  
> @@ -341,14 +343,14 @@ static int find_parent_roots(struct ulist *roots, u64 parent)
>  	ref = find_ref_bytenr(parent);
>  	if (!ref) {
>  		error("bytenr ref not found for parent %llu",
> -				(unsigned long long)parent);
> +		      (unsigned long long)parent);
>  		return -EIO;
>  	}
>  	node = &ref->bytenr_node;
>  	if (ref->bytenr != parent) {
>  		error("found bytenr ref does not match parent: %llu != %llu",
> -				(unsigned long long)ref->bytenr,
> -				(unsigned long long)parent);
> +		      (unsigned long long)ref->bytenr,
> +		      (unsigned long long)parent);
>  		return -EIO;
>  	}
>  
> @@ -364,8 +366,8 @@ static int find_parent_roots(struct ulist *roots, u64 parent)
>  			prev = rb_entry(prev_node, struct ref, bytenr_node);
>  			if (prev->bytenr == parent) {
>  				error(
> -				"unexpected: prev bytenr same as parent: %llu",
> -						(unsigned long long)parent);
> +				      "unexpected: prev bytenr same as parent: %llu",
> +				      (unsigned long long)parent);
>  				return -EIO;
>  			}
>  		}
> @@ -717,9 +719,6 @@ static int travel_tree(struct btrfs_fs_info *info, struct btrfs_root *root,
>  	u64 new_bytenr;
>  	u64 new_num_bytes;
>  
> -//	printf("travel_tree: bytenr: %llu\tnum_bytes: %llu\tref_parent: %llu\n",
> -//	       bytenr, num_bytes, ref_parent);
> -

Don't make big formatting changes with code changes, it makes it hard to tell
what's important and what I can gloss over.  Thanks,

Josef