RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-03-03 09:18:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: subvol list: simplify value assignments

Browse Source 
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2016-10-31 12:15:18 +01:00
parent 37bc144172
commit ebb46b13ac
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
btrfs-list.c
View File

@ -962,7 +962,7 @@ static int list_subvol_search(int fd, struct root_lookup *root_lookup)
struct btrfs_ioctl_search_header sh;
struct btrfs_root_ref *ref;
struct btrfs_root_item *ri;
unsigned long off = 0;
unsigned long off;
int name_len;
char *name;
u64 dir_id;
@ -980,17 +980,15 @@ static int list_subvol_search(int fd, struct root_lookup *root_lookup)
sk->tree_id = BTRFS_ROOT_TREE_OBJECTID;
/* Search both live and deleted subvolumes */
sk->max_type = BTRFS_ROOT_BACKREF_KEY;
sk->min_type = BTRFS_ROOT_ITEM_KEY;
sk->max_type = BTRFS_ROOT_BACKREF_KEY;
sk->min_objectid = BTRFS_FIRST_FREE_OBJECTID;
sk->max_objectid = BTRFS_LAST_FREE_OBJECTID;
sk->max_offset = (u64)-1;
sk->max_transid = (u64)-1;
sk->nr_items = 4096;
while(1) {
sk->nr_items = 4096;
ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args);
if (ret < 0)
return ret;
@ -1045,7 +1043,6 @@ static int list_subvol_search(int fd, struct root_lookup *root_lookup)
sk->min_type = sh.type;
sk->min_offset = sh.offset;
}
sk->nr_items = 4096;
sk->min_offset++;
if (!sk->min_offset)
sk->min_type++;