Skip to content

btrfs-progs: mkfs: Quota support through -Q|--quota

Marcos Paulo de Souza linux-btrfs 1 version Applied

Status from this message: I've applied the above with some fixes to devel.

Get series with b4
b4 am [email protected]

Versions newest first

  1. v4 Latest11 patches 1 replyApplied

Patches in v4 Applied

#Subject and filesSizeRepliesApplied
1/11btrfs-progs: qgroup-verify: Avoid NULL pointer dereference for later silent qgroup repaircheck/qgroup-verify.c+2 -10 replies
2/11btrfs-progs: qgroup-verify: Also repair qgroup status versioncheck/qgroup-verify.c ctree.h+3 -00 replies
3/11btrfs-progs: qgroup-verify: Use fs_info->readonly to check if we should repair qgroupscheck/qgroup-verify.c+1 -10 replies
4/11btrfs-progs: qgroup-verify: Move qgroup classification out of report_qgroupscheck/main.c check/qgroup-verify.c check/qgroup-verify.h+59 -280 replies
5/11btrfs-progs: qgroup-verify: Allow repair_qgroups function to do silent repaircheck/main.c check/qgroup-verify.c check/qgroup-verify.h+13 -100 replies
6/11btrfs-progs: ctree: Introduce function to create an empty treectree.c ctree.h+110 -10 replies
7/11btrfs-progs: mkfs: Introduce function to insert qgroup info and limit itemsmkfs/main.c+34 -00 replies
8/11btrfs-progs: mkfs: Introduce function to setup quota root and rescanmkfs/main.c+86 -00 replies
9/11btrfs-progs: mkfs: Introduce mkfs time quota supportDocumentation/mkfs.btrfs.asciidoc mkfs/main.c+20 -10 replies
10/11btrfs-progs: test/mkfs: Add test case for -Q|--quota optiontests/mkfs-tests/001-basic-profiles/test.sh+10 -00 replies
11/11btrfs-progs: test/mkfs: Add test case for --rootdir and --quotatests/mkfs-tests/018-rootdir-with-quota/test.sh+51 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.

Read the v4 thread

Cover letter [PATCH v4 00/11] btrfs-progs: mkfs: Quota support through -Q|--quota

From: Marcos Paulo de Souza <[email protected]>

Hi guys,

This if the forth version of this patchset. The last submission of these patches was in 2018[1]. This version is based on top on the current devel branch, with minor cleanups, minor conflicts and only a real fix in patch 0008. I would like to ask you guys to review these patches, since v3 didn't receive any feedback at the time.

I only added my SoB in three patches, which were those were I needed a manual intervention, or a specific fix as I mentioned.

Thanks for your review,
Marcos

Original cover letter for Wenruo:
This patchset adds quota support, which means the result fs will have quota enabled by default, and its accounting is already consistent, no manually rescan or quota enable is needed.

The overall design of such support is:
1) Create needed tree
Both btrfs_root and real root item and tree root leaf. For this, a new infrastructure, btrfs_create_tree(), is added for this.

2) Fill quota root with basic skeleton
Only 3 items are really needed
a) global quota status item
b) quota info for specified qgroup
c) quota limit for specified qgroup

Currently we insert all qgroup items for all existing file trees. If we're going to support extra subvolume at mkfs time, just pass the subvolume id into insert_qgroup_items().

The content doesn't matter at all.

3) Repair qgroups using infrastructure from qgroup-verify In fact, qgroup repair is just offline rescan.
Although the original qgroup-verify infrastructure is mostly noisy, modify it a little to make it silent to function as offline quota rescan.

And such support is mainly designed for developers and QA guys.

As to enable quota, before we must normally mount the fs, enable quota (and rescan if needed).
This ioctl based procedure is not common, and fstests doesn't provide such support.
(Not to mention sometimes rescan itself can be buggy)

There are several attempts to make fstests to support it, but due to different reasons, all these attempts failed.

To make it easier to test all existing test cases with btrfs quota enabled, the current best method is to support quota at mkfs time, and here comes the patchset.

[1]: https://lore.kernel.org/linux-btrfs/[email protected]/T/#m107735cecbf4729b599e6e4eee0a54802909b30d

Qu Wenruo (11):
btrfs-progs: qgroup-verify: Avoid NULL pointer dereference for later
silent qgroup repair
btrfs-progs: qgroup-verify: Also repair qgroup status version
btrfs-progs: qgroup-verify: Use fs_info->readonly to check if we
should repair qgroups
btrfs-progs: qgroup-verify: Move qgroup classification out of
report_qgroups
btrfs-progs: qgroup-verify: Allow repair_qgroups function to do silent
repair
btrfs-progs: ctree: Introduce function to create an empty tree
btrfs-progs: mkfs: Introduce function to insert qgroup info and limit
items
btrfs-progs: mkfs: Introduce function to setup quota root and rescan
btrfs-progs: mkfs: Introduce mkfs time quota support
btrfs-progs: test/mkfs: Add test case for -Q|--quota option
btrfs-progs: test/mkfs: Add test case for --rootdir and --quota

 Documentation/mkfs.btrfs.asciidoc             |   5 +
 check/main.c                                  |  20 +--
 check/qgroup-verify.c                         |  93 ++++++++----
 check/qgroup-verify.h                         |   4 +-
 ctree.c                                       | 109 +++++++++++++-
 ctree.h                                       |   3 +
 mkfs/main.c                                   | 136 +++++++++++++++++-
 tests/mkfs-tests/001-basic-profiles/test.sh   |  10 ++
 .../mkfs-tests/018-rootdir-with-quota/test.sh |  51 +++++++
 9 files changed, 389 insertions(+), 42 deletions(-)
 create mode 100755 tests/mkfs-tests/018-rootdir-with-quota/test.sh
Signature · 1 line
2.25.0