Skip to content

Commit 0345143

Browse files
josefbacikkdave
josefbacik
authored and
kdave
committed
btrfs-progs: rename qgroup items to match the kernel naming scheme
We're going to sync the kernel source into btrfs-progs, and in the kernel we have all these qgroup fields named with short names instead of the full name, so rename referenced -> rfer compressed -> cmpr exclusive -> excl to match the kernel and update all the users, this will make the sync cleaner. ioctl.h is a public header but there are no users of the btrfs_qgroup_limit structure. Signed-off-by: Josef Bacik <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 557d261 commit 0345143

7 files changed

Lines changed: 116 additions & 126 deletions

File tree

‎check/qgroup-verify.c‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ struct qgroup_count;
4949
static struct qgroup_count *find_count(u64 qgroupid);
5050

5151
struct qgroup_info {
52-
u64 referenced;
53-
u64 referenced_compressed;
54-
u64 exclusive;
55-
u64 exclusive_compressed;
52+
u64 rfer;
53+
u64 rfer_cmpr;
54+
u64 excl;
55+
u64 excl_cmpr;
5656
};
5757

5858
struct qgroup_count {
@@ -481,20 +481,20 @@ static int account_one_extent(struct ulist *roots, u64 bytenr, u64 num_bytes)
481481

482482
nr_refs = group_get_cur_refcnt(count);
483483
if (nr_refs) {
484-
count->info.referenced += num_bytes;
485-
count->info.referenced_compressed += num_bytes;
484+
count->info.rfer += num_bytes;
485+
count->info.rfer_cmpr += num_bytes;
486486

487487
if (nr_refs == nr_roots) {
488-
count->info.exclusive += num_bytes;
489-
count->info.exclusive_compressed += num_bytes;
488+
count->info.excl += num_bytes;
489+
count->info.excl_cmpr += num_bytes;
490490
}
491491
}
492492
#ifdef QGROUP_VERIFY_DEBUG
493493
printf("account (%llu, %llu), qgroup %llu/%llu, rfer %llu,"
494494
" excl %llu, refs %llu, roots %llu\n", bytenr, num_bytes,
495495
btrfs_qgroup_level(count->qgroupid),
496496
btrfs_qgroup_subvolid(count->qgroupid),
497-
count->info.referenced, count->info.exclusive, nr_refs,
497+
count->info.rfer, count->info.excl, nr_refs,
498498
nr_roots);
499499
#endif
500500
}
@@ -870,12 +870,10 @@ static struct qgroup_count *alloc_count(struct btrfs_disk_key *key,
870870
c->key = *key;
871871

872872
item = &c->diskinfo;
873-
item->referenced = btrfs_qgroup_info_referenced(leaf, disk);
874-
item->referenced_compressed =
875-
btrfs_qgroup_info_referenced_compressed(leaf, disk);
876-
item->exclusive = btrfs_qgroup_info_exclusive(leaf, disk);
877-
item->exclusive_compressed =
878-
btrfs_qgroup_info_exclusive_compressed(leaf, disk);
873+
item->rfer = btrfs_qgroup_info_rfer(leaf, disk);
874+
item->rfer_cmpr = btrfs_qgroup_info_rfer_cmpr(leaf, disk);
875+
item->excl = btrfs_qgroup_info_excl(leaf, disk);
876+
item->excl_cmpr = btrfs_qgroup_info_excl_cmpr(leaf, disk);
879877
INIT_LIST_HEAD(&c->groups);
880878
INIT_LIST_HEAD(&c->members);
881879
INIT_LIST_HEAD(&c->bad_list);
@@ -1286,8 +1284,8 @@ static int report_qgroup_difference(struct qgroup_count *count, int verbose)
12861284
int is_different;
12871285
struct qgroup_info *info = &count->info;
12881286
struct qgroup_info *disk = &count->diskinfo;
1289-
long long excl_diff = info->exclusive - disk->exclusive;
1290-
long long ref_diff = info->referenced - disk->referenced;
1287+
long long excl_diff = info->excl - disk->excl;
1288+
long long ref_diff = info->rfer - disk->rfer;
12911289

12921290
is_different = excl_diff || ref_diff;
12931291

@@ -1297,16 +1295,16 @@ static int report_qgroup_difference(struct qgroup_count *count, int verbose)
12971295
btrfs_qgroup_subvolid(count->qgroupid),
12981296
is_different ? "are different" : "");
12991297

1300-
print_fields(info->referenced, info->referenced_compressed,
1298+
print_fields(info->rfer, info->rfer_cmpr,
13011299
"our:", "referenced");
1302-
print_fields(disk->referenced, disk->referenced_compressed,
1300+
print_fields(disk->rfer, disk->rfer_cmpr,
13031301
"disk:", "referenced");
13041302
if (ref_diff)
13051303
print_fields_signed(ref_diff, ref_diff,
13061304
"diff:", "referenced");
1307-
print_fields(info->exclusive, info->exclusive_compressed,
1305+
print_fields(info->excl, info->excl_cmpr,
13081306
"our:", "exclusive");
1309-
print_fields(disk->exclusive, disk->exclusive_compressed,
1307+
print_fields(disk->excl, disk->excl_cmpr,
13101308
"disk:", "exclusive");
13111309
if (excl_diff)
13121310
print_fields_signed(excl_diff, excl_diff,
@@ -1388,8 +1386,8 @@ static bool is_bad_qgroup(struct qgroup_count *count)
13881386
{
13891387
struct qgroup_info *info = &count->info;
13901388
struct qgroup_info *disk = &count->diskinfo;
1391-
s64 excl_diff = info->exclusive - disk->exclusive;
1392-
s64 ref_diff = info->referenced - disk->referenced;
1389+
s64 excl_diff = info->excl - disk->excl;
1390+
s64 ref_diff = info->rfer - disk->rfer;
13931391

13941392
return (excl_diff || ref_diff);
13951393
}
@@ -1594,15 +1592,15 @@ static int repair_qgroup_info(struct btrfs_fs_info *info,
15941592
btrfs_set_qgroup_info_generation(path.nodes[0], info_item,
15951593
trans->transid);
15961594

1597-
btrfs_set_qgroup_info_referenced(path.nodes[0], info_item,
1598-
count->info.referenced);
1599-
btrfs_set_qgroup_info_referenced_compressed(path.nodes[0], info_item,
1600-
count->info.referenced_compressed);
1595+
btrfs_set_qgroup_info_rfer(path.nodes[0], info_item,
1596+
count->info.rfer);
1597+
btrfs_set_qgroup_info_rfer_cmpr(path.nodes[0], info_item,
1598+
count->info.rfer_cmpr);
16011599

1602-
btrfs_set_qgroup_info_exclusive(path.nodes[0], info_item,
1603-
count->info.exclusive);
1604-
btrfs_set_qgroup_info_exclusive_compressed(path.nodes[0], info_item,
1605-
count->info.exclusive_compressed);
1600+
btrfs_set_qgroup_info_excl(path.nodes[0], info_item,
1601+
count->info.excl);
1602+
btrfs_set_qgroup_info_excl_cmpr(path.nodes[0], info_item,
1603+
count->info.excl_cmpr);
16061604

16071605
btrfs_mark_buffer_dirty(path.nodes[0]);
16081606

‎cmds/qgroup.c‎

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -342,25 +342,25 @@ static void print_qgroup_column(struct btrfs_qgroup *qgroup,
342342
print_qgroup_column_add_blank(BTRFS_QGROUP_QGROUPID, len);
343343
break;
344344
case BTRFS_QGROUP_RFER:
345-
len = print_u64(qgroup->info.referenced, unit_mode, max_len);
345+
len = print_u64(qgroup->info.rfer, unit_mode, max_len);
346346
break;
347347
case BTRFS_QGROUP_EXCL:
348-
len = print_u64(qgroup->info.exclusive, unit_mode, max_len);
348+
len = print_u64(qgroup->info.excl, unit_mode, max_len);
349349
break;
350350
case BTRFS_QGROUP_PARENT:
351351
len = print_parent_column(qgroup);
352352
print_qgroup_column_add_blank(BTRFS_QGROUP_PARENT, len);
353353
break;
354354
case BTRFS_QGROUP_MAX_RFER:
355355
if (qgroup->limit.flags & BTRFS_QGROUP_LIMIT_MAX_RFER)
356-
len = print_u64(qgroup->limit.max_referenced,
356+
len = print_u64(qgroup->limit.max_rfer,
357357
unit_mode, max_len);
358358
else
359359
len = printf("%*s", max_len, "none");
360360
break;
361361
case BTRFS_QGROUP_MAX_EXCL:
362362
if (qgroup->limit.flags & BTRFS_QGROUP_LIMIT_MAX_EXCL)
363-
len = print_u64(qgroup->limit.max_exclusive,
363+
len = print_u64(qgroup->limit.max_excl,
364364
unit_mode, max_len);
365365
else
366366
len = printf("%*s", max_len, "none");
@@ -503,9 +503,9 @@ static int comp_entry_with_rfer(struct btrfs_qgroup *entry1,
503503
{
504504
int ret;
505505

506-
if (entry1->info.referenced > entry2->info.referenced)
506+
if (entry1->info.rfer > entry2->info.rfer)
507507
ret = 1;
508-
else if (entry1->info.referenced < entry2->info.referenced)
508+
else if (entry1->info.rfer < entry2->info.rfer)
509509
ret = -1;
510510
else
511511
ret = 0;
@@ -519,9 +519,9 @@ static int comp_entry_with_excl(struct btrfs_qgroup *entry1,
519519
{
520520
int ret;
521521

522-
if (entry1->info.exclusive > entry2->info.exclusive)
522+
if (entry1->info.excl > entry2->info.excl)
523523
ret = 1;
524-
else if (entry1->info.exclusive < entry2->info.exclusive)
524+
else if (entry1->info.excl < entry2->info.excl)
525525
ret = -1;
526526
else
527527
ret = 0;
@@ -535,9 +535,9 @@ static int comp_entry_with_max_rfer(struct btrfs_qgroup *entry1,
535535
{
536536
int ret;
537537

538-
if (entry1->limit.max_referenced > entry2->limit.max_referenced)
538+
if (entry1->limit.max_rfer > entry2->limit.max_rfer)
539539
ret = 1;
540-
else if (entry1->limit.max_referenced < entry2->limit.max_referenced)
540+
else if (entry1->limit.max_rfer < entry2->limit.max_rfer)
541541
ret = -1;
542542
else
543543
ret = 0;
@@ -551,9 +551,9 @@ static int comp_entry_with_max_excl(struct btrfs_qgroup *entry1,
551551
{
552552
int ret;
553553

554-
if (entry1->limit.max_exclusive > entry2->limit.max_exclusive)
554+
if (entry1->limit.max_excl > entry2->limit.max_excl)
555555
ret = 1;
556-
else if (entry1->limit.max_exclusive < entry2->limit.max_exclusive)
556+
else if (entry1->limit.max_excl < entry2->limit.max_excl)
557557
ret = -1;
558558
else
559559
ret = 0;
@@ -806,12 +806,10 @@ static int update_qgroup_info(int fd, struct qgroup_lookup *qgroup_lookup, u64 q
806806
return PTR_ERR(bq);
807807

808808
bq->info.generation = btrfs_stack_qgroup_info_generation(info);
809-
bq->info.referenced = btrfs_stack_qgroup_info_referenced(info);
810-
bq->info.referenced_compressed =
811-
btrfs_stack_qgroup_info_referenced_compressed(info);
812-
bq->info.exclusive = btrfs_stack_qgroup_info_exclusive(info);
813-
bq->info.exclusive_compressed =
814-
btrfs_stack_qgroup_info_exclusive_compressed(info);
809+
bq->info.rfer = btrfs_stack_qgroup_info_rfer(info);
810+
bq->info.rfer_cmpr = btrfs_stack_qgroup_info_rfer_cmpr(info);
811+
bq->info.excl = btrfs_stack_qgroup_info_excl(info);
812+
bq->info.excl_cmpr = btrfs_stack_qgroup_info_excl_cmpr(info);
815813

816814
return 0;
817815
}
@@ -827,13 +825,10 @@ static int update_qgroup_limit(int fd, struct qgroup_lookup *qgroup_lookup,
827825
return PTR_ERR(bq);
828826

829827
bq->limit.flags = btrfs_stack_qgroup_limit_flags(limit);
830-
bq->limit.max_referenced =
831-
btrfs_stack_qgroup_limit_max_referenced(limit);
832-
bq->limit.max_exclusive =
833-
btrfs_stack_qgroup_limit_max_exclusive(limit);
834-
bq->limit.rsv_referenced =
835-
btrfs_stack_qgroup_limit_rsv_referenced(limit);
836-
bq->limit.rsv_exclusive = btrfs_stack_qgroup_limit_rsv_exclusive(limit);
828+
bq->limit.max_rfer = btrfs_stack_qgroup_limit_max_rfer(limit);
829+
bq->limit.max_excl = btrfs_stack_qgroup_limit_max_excl(limit);
830+
bq->limit.rsv_rfer = btrfs_stack_qgroup_limit_rsv_rfer(limit);
831+
bq->limit.rsv_excl = btrfs_stack_qgroup_limit_rsv_excl(limit);
837832

838833
return 0;
839834
}
@@ -1126,23 +1121,23 @@ static void __update_columns_max_len(struct btrfs_qgroup *bq,
11261121
btrfs_qgroup_columns[column].max_len = len;
11271122
break;
11281123
case BTRFS_QGROUP_RFER:
1129-
len = strlen(pretty_size_mode(bq->info.referenced, unit_mode));
1124+
len = strlen(pretty_size_mode(bq->info.rfer, unit_mode));
11301125
if (btrfs_qgroup_columns[column].max_len < len)
11311126
btrfs_qgroup_columns[column].max_len = len;
11321127
break;
11331128
case BTRFS_QGROUP_EXCL:
1134-
len = strlen(pretty_size_mode(bq->info.exclusive, unit_mode));
1129+
len = strlen(pretty_size_mode(bq->info.excl, unit_mode));
11351130
if (btrfs_qgroup_columns[column].max_len < len)
11361131
btrfs_qgroup_columns[column].max_len = len;
11371132
break;
11381133
case BTRFS_QGROUP_MAX_RFER:
1139-
len = strlen(pretty_size_mode(bq->limit.max_referenced,
1134+
len = strlen(pretty_size_mode(bq->limit.max_rfer,
11401135
unit_mode));
11411136
if (btrfs_qgroup_columns[column].max_len < len)
11421137
btrfs_qgroup_columns[column].max_len = len;
11431138
break;
11441139
case BTRFS_QGROUP_MAX_EXCL:
1145-
len = strlen(pretty_size_mode(bq->limit.max_exclusive,
1140+
len = strlen(pretty_size_mode(bq->limit.max_excl,
11461141
unit_mode));
11471142
if (btrfs_qgroup_columns[column].max_len < len)
11481143
btrfs_qgroup_columns[column].max_len = len;
@@ -2034,10 +2029,10 @@ static int cmd_qgroup_limit(const struct cmd_struct *cmd, int argc, char **argv)
20342029
BTRFS_QGROUP_LIMIT_EXCL_CMPR;
20352030
if (exclusive) {
20362031
args.lim.flags |= BTRFS_QGROUP_LIMIT_MAX_EXCL;
2037-
args.lim.max_exclusive = size;
2032+
args.lim.max_excl = size;
20382033
} else {
20392034
args.lim.flags |= BTRFS_QGROUP_LIMIT_MAX_RFER;
2040-
args.lim.max_referenced = size;
2035+
args.lim.max_rfer = size;
20412036
}
20422037

20432038
if (argc - optind == 2) {

‎cmds/qgroup.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424

2525
struct btrfs_qgroup_info {
2626
u64 generation;
27-
u64 referenced;
28-
u64 referenced_compressed;
29-
u64 exclusive;
30-
u64 exclusive_compressed;
27+
u64 rfer;
28+
u64 rfer_cmpr;
29+
u64 excl;
30+
u64 excl_cmpr;
3131
};
3232

3333
struct btrfs_qgroup_stats {

‎cmds/subvolume.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,15 +1483,15 @@ static int cmd_subvolume_show(const struct cmd_struct *cmd, int argc, char **arg
14831483
fflush(stdout);
14841484

14851485
pr_verbose(LOG_DEFAULT, "\t Limit referenced:\t%s\n",
1486-
stats.limit.max_referenced == 0 ? "-" :
1487-
pretty_size_mode(stats.limit.max_referenced, unit_mode));
1486+
stats.limit.max_rfer == 0 ? "-" :
1487+
pretty_size_mode(stats.limit.max_rfer, unit_mode));
14881488
pr_verbose(LOG_DEFAULT, "\t Limit exclusive:\t%s\n",
1489-
stats.limit.max_exclusive == 0 ? "-" :
1490-
pretty_size_mode(stats.limit.max_exclusive, unit_mode));
1489+
stats.limit.max_excl == 0 ? "-" :
1490+
pretty_size_mode(stats.limit.max_excl, unit_mode));
14911491
pr_verbose(LOG_DEFAULT, "\t Usage referenced:\t%s\n",
1492-
pretty_size_mode(stats.info.referenced, unit_mode));
1492+
pretty_size_mode(stats.info.rfer, unit_mode));
14931493
pr_verbose(LOG_DEFAULT, "\t Usage exclusive:\t%s\n",
1494-
pretty_size_mode(stats.info.exclusive, unit_mode));
1494+
pretty_size_mode(stats.info.excl, unit_mode));
14951495

14961496
out:
14971497
free(subvol_path);

‎ioctl.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ BUILD_ASSERT(sizeof(struct btrfs_ioctl_vol_args) == 4096);
7171

7272
struct btrfs_qgroup_limit {
7373
__u64 flags;
74-
__u64 max_referenced;
75-
__u64 max_exclusive;
76-
__u64 rsv_referenced;
77-
__u64 rsv_exclusive;
74+
__u64 max_rfer;
75+
__u64 max_excl;
76+
__u64 rsv_rfer;
77+
__u64 rsv_excl;
7878
};
7979
BUILD_ASSERT(sizeof(struct btrfs_qgroup_limit) == 40);
8080

0 commit comments

Comments
 (0)