Skip to content
Snippets Groups Projects
Commit b9633ebb authored by Lennart Poettering's avatar Lennart Poettering
Browse files

fs-util: move attempts counter in openat_report_new() into loop

parent 4ffecbbb
No related branches found
No related tags found
No related merge requests found
...@@ -1077,7 +1077,6 @@ int open_mkdir_at_full(int dirfd, const char *path, int flags, XOpenFlags xopen_ ...@@ -1077,7 +1077,6 @@ int open_mkdir_at_full(int dirfd, const char *path, int flags, XOpenFlags xopen_
} }
int openat_report_new(int dirfd, const char *pathname, int flags, mode_t mode, bool *ret_newly_created) { int openat_report_new(int dirfd, const char *pathname, int flags, mode_t mode, bool *ret_newly_created) {
unsigned attempts = 7;
int fd; int fd;
/* Just like openat(), but adds one thing: optionally returns whether we created the file anew or if /* Just like openat(), but adds one thing: optionally returns whether we created the file anew or if
...@@ -1099,7 +1098,7 @@ int openat_report_new(int dirfd, const char *pathname, int flags, mode_t mode, b ...@@ -1099,7 +1098,7 @@ int openat_report_new(int dirfd, const char *pathname, int flags, mode_t mode, b
return fd; return fd;
} }
for (;;) { for (unsigned attempts = 7;;) {
/* First, attempt to open without O_CREAT/O_EXCL, i.e. open existing file */ /* First, attempt to open without O_CREAT/O_EXCL, i.e. open existing file */
fd = openat(dirfd, pathname, flags & ~(O_CREAT | O_EXCL), mode); fd = openat(dirfd, pathname, flags & ~(O_CREAT | O_EXCL), mode);
if (fd >= 0) { if (fd >= 0) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment