From b9633ebb2a714ada7dc9747ec53af02c3627d05c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 22 Oct 2024 17:49:40 +0200
Subject: [PATCH] fs-util: move attempts counter in openat_report_new() into
loop
---
src/basic/fs-util.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 9397c4b384..7c88e9fef7 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -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) {
- unsigned attempts = 7;
int fd;
/* 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
return fd;
}
- for (;;) {
+ for (unsigned attempts = 7;;) {
/* First, attempt to open without O_CREAT/O_EXCL, i.e. open existing file */
fd = openat(dirfd, pathname, flags & ~(O_CREAT | O_EXCL), mode);
if (fd >= 0) {
--
GitLab