77328e7180
- refresh references on the following patches: * 0200-btrfs-progs-print-qgroup-excl-as-unsigned.patch * 0201-btrfs-progs-import-ulist.patch * 0202-btrfs-progs-add-quota-group-verify-code.patch * 0203-btrfs-progs-show-extent-state-for-a-subvolume.patch - btrfs-progs: ignore orphaned qgroups by default - Added patch: * 0204-btrfs-progs-ignore-orphaned-qgroups-by-default.patch OBS-URL: https://build.opensuse.org/request/show/240115 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=165
69 lines
2.2 KiB
Diff
69 lines
2.2 KiB
Diff
From 049554016bb8007c39cebc9d855fea5e600a11a0 Mon Sep 17 00:00:00 2001
|
|
From: Mark Fasheh <mfasheh@suse.de>
|
|
Date: Tue, 8 Jul 2014 13:34:18 -0700
|
|
Subject: btrfs-progs: ignore orphaned qgroups by default
|
|
References: bnc#886493 bnc#865621
|
|
Upstream: submitted
|
|
|
|
qgroup items are not deleted by btrfs when the underlying subvolume goes
|
|
away. As a result, btrfsck will print those as inconsistent. This can
|
|
clutter up the printout so we ignore them by default. They are still printed
|
|
if a full report (via --qgroup-report) is requested.
|
|
|
|
Signed-off-by: Mark Fasheh <mfasheh@suse.de>
|
|
---
|
|
qgroup-verify.c | 14 +++++++++++++-
|
|
1 file changed, 13 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/qgroup-verify.c b/qgroup-verify.c
|
|
index 81a1651..2e1716d 100644
|
|
--- a/qgroup-verify.c
|
|
+++ b/qgroup-verify.c
|
|
@@ -38,6 +38,7 @@ static void add_bytes(u64 root_objectid, u64 num_bytes, int exclusive);
|
|
|
|
struct qgroup_count {
|
|
u64 qgroupid;
|
|
+ int subvol_exists;
|
|
|
|
struct btrfs_disk_key key;
|
|
struct btrfs_qgroup_info_item diskinfo;
|
|
@@ -697,8 +698,10 @@ static int load_quota_info(struct btrfs_fs_info *info)
|
|
{
|
|
int ret;
|
|
struct btrfs_root *root = info->quota_root;
|
|
+ struct btrfs_root *tmproot;
|
|
struct btrfs_path path;
|
|
struct btrfs_key key;
|
|
+ struct btrfs_key root_key;
|
|
struct btrfs_disk_key disk_key;
|
|
struct extent_buffer *leaf;
|
|
struct btrfs_qgroup_info_item *item;
|
|
@@ -745,6 +748,15 @@ static int load_quota_info(struct btrfs_fs_info *info)
|
|
fprintf(stderr, "ERROR: out of memory\n");
|
|
goto out;
|
|
}
|
|
+
|
|
+ root_key.objectid = key.offset;
|
|
+ root_key.type = BTRFS_ROOT_ITEM_KEY;
|
|
+ root_key.offset = (u64)-1;
|
|
+ tmproot = btrfs_read_fs_root_no_cache(info, &root_key);
|
|
+ if (tmproot && !IS_ERR(tmproot)) {
|
|
+ count->subvol_exists = 1;
|
|
+ free(tmproot);
|
|
+ }
|
|
}
|
|
|
|
ret = btrfs_next_leaf(root, &path);
|
|
@@ -1008,7 +1020,7 @@ static void print_qgroup_difference(struct qgroup_count *count, int verbose)
|
|
|
|
is_different = excl_diff || ref_diff;
|
|
|
|
- if (verbose || is_different) {
|
|
+ if (verbose || (is_different && count->subvol_exists)) {
|
|
printf("Counts for qgroup id: %llu %s\n",
|
|
(unsigned long long)count->qgroupid,
|
|
is_different ? "are different" : "");
|
|
--
|
|
1.8.4.5
|
|
|