@@ -98,7 +98,6 @@ static const char * const cmd_subvolume_list_usage[] = {
98
98
enum btrfs_list_layout {
99
99
BTRFS_LIST_LAYOUT_DEFAULT = 0 ,
100
100
BTRFS_LIST_LAYOUT_TABLE ,
101
- BTRFS_LIST_LAYOUT_RAW ,
102
101
BTRFS_LIST_LAYOUT_JSON
103
102
};
104
103
@@ -1202,23 +1201,6 @@ static void print_subvolume_column(struct root_info *subv,
1202
1201
}
1203
1202
}
1204
1203
1205
- static void print_one_subvol_info_raw (struct root_info * subv ,
1206
- const char * raw_prefix )
1207
- {
1208
- int i ;
1209
-
1210
- for (i = 0 ; i < BTRFS_LIST_ALL ; i ++ ) {
1211
- if (!btrfs_list_columns [i ].need_print )
1212
- continue ;
1213
-
1214
- if (raw_prefix )
1215
- pr_verbose (LOG_DEFAULT , "%s" ,raw_prefix );
1216
-
1217
- print_subvolume_column (subv , i );
1218
- }
1219
- pr_verbose (LOG_DEFAULT , "\n" );
1220
- }
1221
-
1222
1204
static void print_one_subvol_info_table (struct root_info * subv )
1223
1205
{
1224
1206
int i ;
@@ -1349,7 +1331,7 @@ static void print_one_subvol_info_json(struct format_ctx *fctx,
1349
1331
1350
1332
1351
1333
static void print_all_subvol_info (struct rb_root * sorted_tree ,
1352
- enum btrfs_list_layout layout , const char * raw_prefix )
1334
+ enum btrfs_list_layout layout )
1353
1335
{
1354
1336
struct rb_node * n ;
1355
1337
struct root_info * entry ;
@@ -1377,9 +1359,6 @@ static void print_all_subvol_info(struct rb_root *sorted_tree,
1377
1359
case BTRFS_LIST_LAYOUT_TABLE :
1378
1360
print_one_subvol_info_table (entry );
1379
1361
break ;
1380
- case BTRFS_LIST_LAYOUT_RAW :
1381
- print_one_subvol_info_raw (entry , raw_prefix );
1382
- break ;
1383
1362
case BTRFS_LIST_LAYOUT_JSON :
1384
1363
print_one_subvol_info_json (& fctx , entry );
1385
1364
break ;
@@ -1425,8 +1404,7 @@ static int btrfs_list_subvols(int fd, struct rb_root *root_lookup)
1425
1404
1426
1405
static int btrfs_list_subvols_print (int fd , struct btrfs_list_filter_set * filter_set ,
1427
1406
struct btrfs_list_comparer_set * comp_set ,
1428
- enum btrfs_list_layout layout , int full_path ,
1429
- const char * raw_prefix )
1407
+ enum btrfs_list_layout layout , int full_path )
1430
1408
{
1431
1409
struct rb_root root_lookup ;
1432
1410
struct rb_root root_sort ;
@@ -1448,7 +1426,7 @@ static int btrfs_list_subvols_print(int fd, struct btrfs_list_filter_set *filter
1448
1426
filter_and_sort_subvol (& root_lookup , & root_sort , filter_set ,
1449
1427
comp_set , top_id );
1450
1428
1451
- print_all_subvol_info (& root_sort , layout , raw_prefix );
1429
+ print_all_subvol_info (& root_sort , layout );
1452
1430
rb_free_nodes (& root_lookup , free_root_info );
1453
1431
1454
1432
return 0 ;
@@ -1726,7 +1704,7 @@ static int cmd_subvolume_list(const struct cmd_struct *cmd, int argc, char **arg
1726
1704
layout = BTRFS_LIST_LAYOUT_JSON ;
1727
1705
1728
1706
ret = btrfs_list_subvols_print (fd , filter_set , comparer_set ,
1729
- layout , !is_list_all && !is_only_in_path , NULL );
1707
+ layout , !is_list_all && !is_only_in_path );
1730
1708
1731
1709
out :
1732
1710
close (fd );
0 commit comments