marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: qgroup: swap the argument in the caller of update_qgroup_relation 

The QGROUP_RELATION item is very special, it always exists in pairs
(with objectid and offset exchanged). Its objectid and offset are the
ids of a pair of parent and child qgroups, respectively. The larger one
is parent and the smaller one is child. After the following commit, the
order of the parameters is wrong and causes qgroup show to output the
wrong qgroup parent-child relationship.

Fixes: aaf2dac5ef ("btrfs-progs: qgroup: split update_qgroup to reduce arguments")
Issue: #129
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Lu Fengqi 2018-05-08 13:48:02 +08:00 committed by David Sterba
parent 0ef6797205
commit 8eb7e9d43a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qgroup.c
View File

@ -1051,7 +1051,7 @@ static int __qgroups_search(int fd, struct qgroup_lookup *qgroup_lookup)
struct btrfs_qgroup_limit_item *limit;
u64 flags;
u64 qgroupid;
u64 qgroupid1;
u64 child, parent;
memset(&args, 0, sizeof(args));
@ -1119,14 +1119,14 @@ static int __qgroups_search(int fd, struct qgroup_lookup *qgroup_lookup)
qgroupid, limit);
break;
case BTRFS_QGROUP_RELATION_KEY:
qgroupid = btrfs_search_header_offset(sh);
qgroupid1 = btrfs_search_header_objectid(sh);
child = btrfs_search_header_offset(sh);
parent = btrfs_search_header_objectid(sh);
if (qgroupid < qgroupid1)
if (parent <= child)
break;
ret = update_qgroup_relation(qgroup_lookup,
qgroupid, qgroupid1);
child, parent);
break;
default:
return ret;