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

btrfs-progs: qgroup: cleanup __qgroup_search 

Replace the if statement with the switch statement, and return the
appropriate value for the future use rather than directly exit.

Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Lu Fengqi 2017-11-13 13:33:16 +08:00 committed by David Sterba
parent f0445b8a34
commit b114f7b537
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
qgroup.c
View File

@ -1046,8 +1046,10 @@ static int __qgroups_search(int fd, struct qgroup_lookup *qgroup_lookup)
struct btrfs_ioctl_search_header *sh; struct btrfs_ioctl_search_header *sh;
unsigned long off = 0; unsigned long off = 0;
unsigned int i; unsigned int i;
struct btrfs_qgroup_status_item *si;
struct btrfs_qgroup_info_item *info; struct btrfs_qgroup_info_item *info;
struct btrfs_qgroup_limit_item *limit; struct btrfs_qgroup_limit_item *limit;
u64 flags;
u64 qgroupid; u64 qgroupid;
u64 qgroupid1; u64 qgroupid1;
@ -1092,44 +1094,47 @@ static int __qgroups_search(int fd, struct qgroup_lookup *qgroup_lookup)
off); off);
off += sizeof(*sh); off += sizeof(*sh);
if (btrfs_search_header_type(sh) switch (btrfs_search_header_type(sh)) {
== BTRFS_QGROUP_STATUS_KEY) { case BTRFS_QGROUP_STATUS_KEY:
struct btrfs_qgroup_status_item *si;
u64 flags;
si = (struct btrfs_qgroup_status_item *) si = (struct btrfs_qgroup_status_item *)
(args.buf + off); (args.buf + off);
flags = btrfs_stack_qgroup_status_flags(si); flags = btrfs_stack_qgroup_status_flags(si);
print_status_flag_warning(flags); print_status_flag_warning(flags);
} else if (btrfs_search_header_type(sh) break;
== BTRFS_QGROUP_INFO_KEY) { case BTRFS_QGROUP_INFO_KEY:
qgroupid = btrfs_search_header_offset(sh); qgroupid = btrfs_search_header_offset(sh);
info = (struct btrfs_qgroup_info_item *) info = (struct btrfs_qgroup_info_item *)
(args.buf + off); (args.buf + off);
update_qgroup_info(qgroup_lookup, qgroupid, ret = update_qgroup_info(qgroup_lookup,
info); qgroupid, info);
} else if (btrfs_search_header_type(sh) break;
== BTRFS_QGROUP_LIMIT_KEY) { case BTRFS_QGROUP_LIMIT_KEY:
qgroupid = btrfs_search_header_offset(sh); qgroupid = btrfs_search_header_offset(sh);
limit = (struct btrfs_qgroup_limit_item *) limit = (struct btrfs_qgroup_limit_item *)
(args.buf + off); (args.buf + off);
update_qgroup_limit(qgroup_lookup, qgroupid, ret = update_qgroup_limit(qgroup_lookup,
limit); qgroupid, limit);
} else if (btrfs_search_header_type(sh) break;
== BTRFS_QGROUP_RELATION_KEY) { case BTRFS_QGROUP_RELATION_KEY:
qgroupid = btrfs_search_header_offset(sh); qgroupid = btrfs_search_header_offset(sh);
qgroupid1 = btrfs_search_header_objectid(sh); qgroupid1 = btrfs_search_header_objectid(sh);
if (qgroupid < qgroupid1) if (qgroupid < qgroupid1)
goto skip; break;
ret = update_qgroup_relation(qgroup_lookup,
qgroupid, qgroupid1);
break;
default:
return ret;
}
if (ret)
return ret;
update_qgroup_relation(qgroup_lookup, qgroupid,
qgroupid1);
} else
goto done;
skip:
off += btrfs_search_header_len(sh); off += btrfs_search_header_len(sh);
/* /*
@ -1151,7 +1156,6 @@ skip:
break; break;
} }
done:
return ret; return ret;
} }