Skip to content

netapp: update invalid device handling #2860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igaw merged 2 commits into from
Jul 9, 2025
Merged

netapp: update invalid device handling #2860

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc343b3
netapp-ontapdev: update invalid device handling
martin-gpy Jul 9, 2025
0edb05b
netapp-smdev: update invalid device handling
martin-gpy Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions plugins/netapp/netapp-nvme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,11 +931,19 @@ static int netapp_smdevices(int argc, char **argv, struct command *command,

if (devname) {
int subsys_num, nsid;
struct stat st;
char path[512];

if (sscanf(devname, "nvme%dn%d", &subsys_num, &nsid) != 2) {
fprintf(stderr, "Invalid device name %s\n", devname);
return -EINVAL;
}

sprintf(path, "/dev/%s", devname);
if (stat(path, &st) != 0) {
fprintf(stderr, "%s does not exist\n", path);
return -EINVAL;
}
}

smdevices = calloc(num, sizeof(*smdevices));
Expand Down Expand Up @@ -1023,11 +1031,19 @@ static int netapp_ontapdevices(int argc, char **argv, struct command *command,

if (devname) {
int subsys_num, nsid;
struct stat st;
char path[512];

if (sscanf(devname, "nvme%dn%d", &subsys_num, &nsid) != 2) {
fprintf(stderr, "Invalid device name %s\n", devname);
return -EINVAL;
}

sprintf(path, "/dev/%s", devname);
if (stat(path, &st) != 0) {
fprintf(stderr, "%s does not exist\n", path);
return -EINVAL;
}
}

num = scandir(dev_path, &devices, netapp_nvme_filter, alphasort);
Expand Down