Skip to content

ioctl: retry ioctl on EINTR return value #993

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

Closed
igaw wants to merge 1 commit into from
Closed

ioctl: retry ioctl on EINTR return value #993

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/nvme/ioctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ int nvme_subsystem_reset(int fd)
ret = nvme_verify_chr(fd);
if (ret)
return ret;
return ioctl(fd, NVME_IOCTL_SUBSYS_RESET);
return TFR(ioctl(fd, NVME_IOCTL_SUBSYS_RESET));
}

int nvme_ctrl_reset(int fd)
Expand All @@ -62,7 +62,7 @@ int nvme_ctrl_reset(int fd)
ret = nvme_verify_chr(fd);
if (ret)
return ret;
return ioctl(fd, NVME_IOCTL_RESET);
return TFR(ioctl(fd, NVME_IOCTL_RESET));
}

int nvme_ns_rescan(int fd)
Expand All @@ -72,13 +72,13 @@ int nvme_ns_rescan(int fd)
ret = nvme_verify_chr(fd);
if (ret)
return ret;
return ioctl(fd, NVME_IOCTL_RESCAN);
return TFR(ioctl(fd, NVME_IOCTL_RESCAN));
}

int nvme_get_nsid(int fd, __u32 *nsid)
{
errno = 0;
*nsid = ioctl(fd, NVME_IOCTL_ID);
*nsid = TFR(ioctl(fd, NVME_IOCTL_ID));
return -1 * (errno != 0);
}

Expand All @@ -87,7 +87,7 @@ int nvme_submit_passthru64(int fd, unsigned long ioctl_cmd,
struct nvme_passthru_cmd64 *cmd,
__u64 *result)
{
int err = ioctl(fd, ioctl_cmd, cmd);
int err = TFR(ioctl(fd, ioctl_cmd, cmd));

if (err >= 0 && result)
*result = cmd->result;
Expand All @@ -98,7 +98,7 @@ __attribute__((weak))
int nvme_submit_passthru(int fd, unsigned long ioctl_cmd,
struct nvme_passthru_cmd *cmd, __u32 *result)
{
int err = ioctl(fd, ioctl_cmd, cmd);
int err = TFR(ioctl(fd, ioctl_cmd, cmd));

if (err >= 0 && result)
*result = cmd->result;
Expand Down