Skip to content

Revert "fabrics: retry connect command on EINTR" #1010

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 1 commit into from
May 8, 2025
Merged

Revert "fabrics: retry connect command on EINTR" #1010

Show file tree
Hide file tree
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
14 changes: 0 additions & 14 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,20 +244,6 @@ else
conf.set('fallthrough', 'do {} while (0) /* fallthrough */')
endif

if cc.has_function('TEMP_FAILURE_RETRY', prefix : '#include <errno.h>')
conf.set('TFR', 'TEMP_FAILURE_RETRY')
else
conf.set('TFR(exp)', ''' \
({ \
long int __result = 0; \
do { \
__result = (long int)(exp); \
} while ((__result == -1) && (errno == EINTR)); \
__result; \
})
''')
endif

################################################################################
substs = configuration_data()
substs.set('NAME', meson.project_name())
Expand Down
2 changes: 1 addition & 1 deletion src/nvme/fabrics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ static int __nvmf_add_ctrl(nvme_root_t r, const char *argstr)

nvme_msg(r, LOG_DEBUG, "connect ctrl, '%.*s'\n",
(int)strcspn(argstr,"\n"), argstr);
ret = TFR(write(fd, argstr, len));
ret = write(fd, argstr, len);
if (ret != len) {
nvme_msg(r, LOG_INFO, "Failed to write to %s: %s\n",
nvmf_dev, strerror(errno));
Expand Down