From: "Zbigniew Kempczyński" <zbigniew.kempczynski@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: "Zbigniew Kempczyński" <zbigniew.kempczynski@intel.com>,
"Kamil Konieczny" <kamil.konieczny@linux.intel.com>,
"Ryszard Knop" <ryszard.knop@intel.com>,
"Krzysztof Karas" <krzysztof.karas@intel.com>
Subject: [PATCH i-g-t v4 1/4] runner: Rename dirfd to avoid clash with dirfd()
Date: Mon, 20 Apr 2026 10:56:55 +0200 [thread overview]
Message-ID: <20260420085653.2587750-7-zbigniew.kempczynski@intel.com> (raw)
In-Reply-To: <20260420085653.2587750-6-zbigniew.kempczynski@intel.com>
Upcoming change within execute_next_entry() will call dirfd() so
rename local dirfd variable is necessary.
Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
Cc: Ryszard Knop <ryszard.knop@intel.com>
Reviewed-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>
Reviewed-by: Krzysztof Karas <krzysztof.karas@intel.com>
---
runner/executor.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/runner/executor.c b/runner/executor.c
index 847abe481a..1485b59d1f 100644
--- a/runner/executor.c
+++ b/runner/executor.c
@@ -1772,7 +1772,7 @@ static int execute_next_entry(struct execute_state *state,
char **abortreason,
bool *abort_already_written)
{
- int dirfd;
+ int idirfd;
int outputs[_F_LAST];
int kmsgfd;
int outpipe[2] = { -1, -1 };
@@ -1786,19 +1786,19 @@ static int execute_next_entry(struct execute_state *state,
snprintf(name, sizeof(name), "%zd", idx);
mkdirat(resdirfd, name, 0777);
- if ((dirfd = openat(resdirfd, name, O_DIRECTORY | O_RDONLY | O_CLOEXEC)) < 0) {
+ if ((idirfd = openat(resdirfd, name, O_DIRECTORY | O_RDONLY | O_CLOEXEC)) < 0) {
errf("Error accessing individual test result directory\n");
return -1;
}
- if (!open_output_files(dirfd, outputs, true)) {
+ if (!open_output_files(idirfd, outputs, true)) {
errf("Error opening output files\n");
result = -1;
goto out_dirfd;
}
if (settings->sync) {
- fsync(dirfd);
+ fsync(idirfd);
fsync(resdirfd);
}
@@ -1900,8 +1900,8 @@ out_pipe:
close_outputs(outputs);
out_dirfd:
if (settings->sync)
- fsync(dirfd);
- close(dirfd);
+ fsync(idirfd);
+ close(idirfd);
if (settings->sync)
fsync(resdirfd);
--
2.43.0
next prev parent reply other threads:[~2026-04-20 8:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-20 8:56 [PATCH i-g-t v4 0/4] RFC: Add attachments support Zbigniew Kempczyński
2026-04-20 8:56 ` Zbigniew Kempczyński [this message]
2026-04-20 8:56 ` [PATCH i-g-t v4 2/4] runner: Create attachments directory to use by hooks Zbigniew Kempczyński
2026-04-21 6:57 ` Krzysztof Karas
2026-04-20 8:56 ` [PATCH i-g-t v4 3/4] intel-ci/hooks: Add hooks-wrapper and aux scripts/allowlists Zbigniew Kempczyński
2026-04-21 8:15 ` Krzysztof Karas
2026-04-21 9:01 ` Zbigniew Kempczyński
2026-04-20 8:56 ` [PATCH i-g-t v4 4/4] runner/resultgen: Insert attachments list into results.json Zbigniew Kempczyński
2026-04-21 8:35 ` Krzysztof Karas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260420085653.2587750-7-zbigniew.kempczynski@intel.com \
--to=zbigniew.kempczynski@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=kamil.konieczny@linux.intel.com \
--cc=krzysztof.karas@intel.com \
--cc=ryszard.knop@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox