Revert "Fix #2020: use /sys to map nvmeXnY to nvmeX"

[pve-storage.git] / PVE / Diskmanage.pm

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index 7012f3edd368f8228c1225fdd56ae5d7545622b5..f682e59d65a460b32175548e396c8d9ec373b01b 100644 (file)
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -93,11 +93,7 @@ sub get_smart_data {
     my $smartdata = {};
     my $type;
 
-    if ($disk =~ m!^/dev/(nvme\d+n\d+)$!) {
-       my $info = get_sysdir_info("/sys/block/$1");
-       $disk = "/dev/".($info->{device}
-           or die "failed to get nvme controller device for $disk\n");
-    }
+    $disk =~ s/n\d+$// if $disk =~ m!^/dev/nvme\d+n\d+$!;
 
     my $cmd = [$SMARTCTL, '-H'];
     push @$cmd, '-A', '-f', 'brief' if !$healthonly;
@@ -377,10 +373,6 @@ sub get_sysdir_info {
     $data->{vendor} = file_read_firstline("$sysdir/device/vendor") || 'unknown';
     $data->{model} = file_read_firstline("$sysdir/device/model") || 'unknown';
 
-    if (defined(my $device = readlink("$sysdir/device"))) {
-       ($data->{device}) = $device =~ m!([^/]+)$!; # strip directory and untaint
-    }
-
     return $data;
 }