From c85f81bc9db5f66d44dc68afb5ea6be2cef61525 Mon Sep 17 00:00:00 2001 From: Liav A Date: Fri, 5 Aug 2022 13:30:49 +0300 Subject: Utilities/lsblk: Remove Interface Type column We are going to remove this slice of data from the SysFS later on, so lsblk must not try to read it. --- Userland/Utilities/lsblk.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'Userland/Utilities') diff --git a/Userland/Utilities/lsblk.cpp b/Userland/Utilities/lsblk.cpp index 278ef95202..cf38835fef 100644 --- a/Userland/Utilities/lsblk.cpp +++ b/Userland/Utilities/lsblk.cpp @@ -13,7 +13,7 @@ #include #include -static constexpr StringView format_row = "{:10s}\t{:10s}\t{:10s}\t{:10s}\t{:10s}"sv; +static constexpr StringView format_row = "{:10s}\t{:10s}\t{:10s}\t{:10s}"sv; ErrorOr serenity_main(Main::Arguments arguments) { @@ -31,7 +31,7 @@ ErrorOr serenity_main(Main::Arguments arguments) return 1; } - outln(format_row, "LUN"sv, "Interface type"sv, "Command set"sv, "Block Size"sv, "Last LBA"sv); + outln(format_row, "LUN"sv, "Command set"sv, "Block Size"sv, "Last LBA"sv); TRY(Core::System::pledge("stdio rpath")); @@ -42,11 +42,6 @@ ErrorOr serenity_main(Main::Arguments arguments) dbgln("Error: Could not open {}: {}", command_set_file->name(), command_set_file->error_string()); continue; } - auto interface_type_file = Core::File::construct(String::formatted("/sys/devices/storage/{}/interface_type", dir)); - if (!interface_type_file->open(Core::OpenMode::ReadOnly)) { - dbgln("Error: Could not open {}: {}", interface_type_file->name(), interface_type_file->error_string()); - continue; - } auto last_lba_file = Core::File::construct(String::formatted("/sys/devices/storage/{}/last_lba", dir)); if (!last_lba_file->open(Core::OpenMode::ReadOnly)) { dbgln("Error: Could not open {}: {}", last_lba_file->name(), last_lba_file->error_string()); @@ -59,11 +54,10 @@ ErrorOr serenity_main(Main::Arguments arguments) } String command_set = StringView(command_set_file->read_all().bytes()); - String interface_type = StringView(interface_type_file->read_all().bytes()); String last_lba = StringView(last_lba_file->read_all().bytes()); String sector_size = StringView(sector_size_file->read_all().bytes()); - outln(format_row, dir, interface_type, command_set, sector_size, last_lba); + outln(format_row, dir, command_set, sector_size, last_lba); } return 0; -- cgit v1.2.3