From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 31C14F531CA for ; Mon, 13 Apr 2026 20:18:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E063310E52D; Mon, 13 Apr 2026 20:18:37 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="i1ZjRhZS"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3913810E52D for ; Mon, 13 Apr 2026 20:17:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1776111461; x=1807647461; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8lVw1dGDUi6oNUn6Q5SjDjBIaECMwNeA/Tojlg8sfw8=; b=i1ZjRhZSGNy3lVhlgHAm+KmIaWP8o+zpkTcyBE0cVyk//TDIJoi1yT0D CCjA0g+fusnaV2+eeKfig7DgBnuLHl1SCRYChWlIjBTVIWbmlyRquPKiP stfXXrHutZ3NsuwIeEGlfTh5UKueu9MQZCjaBetVep09L2y0ffCNFQb6K 4R0tI/RpIUC0Uv/3mg/cug+2CFXMQqS0Av8oqvTVmyU97GgoXA/dUyQ5t ugAscvKSLTfqLezOij43bTpyAyGREaYCleoef8Co9Pq3ND2OOdHzsDB0D IX4BLfVoC8JvjStviUU32wI8dTgOi0lk6GVfM28THEieCBMo7GwwJaYj3 A==; X-CSE-ConnectionGUID: pUkhbuqQS/mjeUJi9+Ahng== X-CSE-MsgGUID: H3LJF6s+SzejZ/GK0mjxdw== X-IronPort-AV: E=McAfee;i="6800,10657,11758"; a="80918906" X-IronPort-AV: E=Sophos;i="6.23,177,1770624000"; d="scan'208";a="80918906" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2026 13:17:41 -0700 X-CSE-ConnectionGUID: EnFp8f/xSkuDeLiLr1ehPw== X-CSE-MsgGUID: ewIvgiBsS7ygmB9YRik65Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,177,1770624000"; d="scan'208";a="226721253" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.245.10]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2026 13:17:39 -0700 From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= To: igt-dev@lists.freedesktop.org Cc: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= , Kamil Konieczny , Ryszard Knop , Krzysztof Karas Subject: [PATCH i-g-t v3 1/5] runner: Rename dirfd to avoid clash with dirfd() Date: Mon, 13 Apr 2026 22:17:24 +0200 Message-ID: <20260413201722.808673-8-zbigniew.kempczynski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413201722.808673-7-zbigniew.kempczynski@intel.com> References: <20260413201722.808673-7-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" Upcoming change within execute_next_entry() will call dirfd() so rename local dirfd variable is necessary. Signed-off-by: Zbigniew Kempczyński Cc: Kamil Konieczny Cc: Ryszard Knop Reviewed-by: Kamil Konieczny Reviewed-by: Krzysztof Karas --- 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