Skip to content

Commit 968a447

Browse files
osandovmaharmstone
authored andcommitted
btrfs-progs: subvol list: remove unused filters
BTRFS_LIST_FILTER_ROOTID hasn't been used since commit 9e73a41 ("btrfs-progs: use libbtrfsutil for get-default"), and BTRFS_LIST_FILTER_BY_PARENT hasn't been used since commit 9005b60 ("btrfs-progs: use libbtrfsutil for subvol show"). Signed-off-by: Omar Sandoval <[email protected]>
1 parent 57c7a7f commit 968a447

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

cmds/subvolume-list.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ enum btrfs_list_column_enum {
193193
};
194194

195195
enum btrfs_list_filter_enum {
196-
BTRFS_LIST_FILTER_ROOTID,
197196
BTRFS_LIST_FILTER_SNAPSHOT_ONLY,
198197
BTRFS_LIST_FILTER_FLAGS,
199198
BTRFS_LIST_FILTER_GEN,
@@ -206,7 +205,6 @@ enum btrfs_list_filter_enum {
206205
BTRFS_LIST_FILTER_CGEN_MORE,
207206
BTRFS_LIST_FILTER_TOPID_EQUAL,
208207
BTRFS_LIST_FILTER_FULL_PATH,
209-
BTRFS_LIST_FILTER_BY_PARENT,
210208
BTRFS_LIST_FILTER_DELETED,
211209
BTRFS_LIST_FILTER_MAX,
212210
};
@@ -932,11 +930,6 @@ static int list_subvol_search(int fd, struct rb_root *root_lookup)
932930
return 0;
933931
}
934932

935-
static int filter_by_rootid(struct root_info *ri, u64 data)
936-
{
937-
return ri->root_id == data;
938-
}
939-
940933
static int filter_snapshot(struct root_info *ri, u64 data)
941934
{
942935
return !!ri->root_offset;
@@ -1005,18 +998,12 @@ static int filter_full_path(struct root_info *ri, u64 data)
1005998
return 1;
1006999
}
10071000

1008-
static int filter_by_parent(struct root_info *ri, u64 data)
1009-
{
1010-
return !uuid_compare(ri->puuid, (u8 *)(unsigned long)data);
1011-
}
1012-
10131001
static int filter_deleted(struct root_info *ri, u64 data)
10141002
{
10151003
return ri->deleted;
10161004
}
10171005

10181006
static btrfs_list_filter_func all_filter_funcs[] = {
1019-
[BTRFS_LIST_FILTER_ROOTID] = filter_by_rootid,
10201007
[BTRFS_LIST_FILTER_SNAPSHOT_ONLY] = filter_snapshot,
10211008
[BTRFS_LIST_FILTER_FLAGS] = filter_flags,
10221009
[BTRFS_LIST_FILTER_GEN_MORE] = filter_gen_more,
@@ -1027,7 +1014,6 @@ static btrfs_list_filter_func all_filter_funcs[] = {
10271014
[BTRFS_LIST_FILTER_CGEN_EQUAL] = filter_cgen_equal,
10281015
[BTRFS_LIST_FILTER_TOPID_EQUAL] = filter_topid_equal,
10291016
[BTRFS_LIST_FILTER_FULL_PATH] = filter_full_path,
1030-
[BTRFS_LIST_FILTER_BY_PARENT] = filter_by_parent,
10311017
[BTRFS_LIST_FILTER_DELETED] = filter_deleted,
10321018
};
10331019

0 commit comments

Comments
 (0)