From nobody Tue Jan 27 18:44:00 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f0vSc4k4yz6QFxp for ; Tue, 27 Jan 2026 18:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0vSc1Q1Nz3qgL for ; Tue, 27 Jan 2026 18:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bLfE6DhcbnAuf7QQBH4nM+8xnVuRG9pij7y6NlPAukA=; b=EEHiI7degY0dcWYl4i8ZO4j5/+zZnke5Ye6iOAOgN5AULy9V7N7LPekIh7NTeqK08dok6i M6N14ZSBpDeEmAlXEQechXcp4LpJDpnsgpY1+UwjKAduZ4mpL/WNqT2o2o4x/hIUaSfLFY UWhlITGcr81wMkhtBCTLxrH9MXdlsq4Ae3HRT5EpLDvoFFVJPIsO9t10BYF73EO76Xt2qn Gn9XPIhV0pWljnX0XupNWNoBYwF+GUPEmXaIx4FnZwJYCzEbPdHDzIXCKXzxz8iTJffLYm /q5QulhvSxH0zKJioIpUWSWC/TEvg/PVsz7a+Yg3f2Fpu3Xj3PGF8JIg4uh4qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bLfE6DhcbnAuf7QQBH4nM+8xnVuRG9pij7y6NlPAukA=; b=ZzPC9Eg5h90ZAPhTGMx3NCtPk3Jyh7SOzwiWqrJwTau/KYHg7cjySkYPVDa0QYOt5jyNmj oEfRrVZfKcTBxpY2FWGYzbuA+b7SJKW0OevTTM9BosC8/GPFRZC+JN8JnveYt1yDZLg4JN iACMqzsG0tDwd4f/qm5ZwOxQXTdKSN4G0lKgOzp5wHInhJhuGv3nhmyua6Hsh6VQPdLUJk RTzHdpXd9DEV6foyQfjsdD9F390yy+i9oU/DVyA1vOhZEemo1J0jptr7l5oMt11y7q8UPr yfKGkZCIE7C3nEHeeh/7OPtC7baKAt5A9PoP4hWdenGxIVfHS8302uZQFL2kJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539440; a=rsa-sha256; cv=none; b=nIgi69ppT1+MJfVajze5g0/FWTo+h5SBLj9fYm98+8glk2rASVSjDncTHup4ikH8PRJXST Ov/lnuHKB6Ve19eDE3GZENnEOXoe23My7S78phIiiJn/hDMrOWOzD1cBwXJhXPFmPLbU03 WZe6VSzc2aeH9Lztq1AijGBpMj+RbRWWim4Eho8SfMRsW0SkVJThJmy/VJtbnK0+BAo5s1 9u++1ZglzzO6CptW/FkQXQiLNlD/Dz2J2tNHiHJ1iogp6Oh6ZbkSrdh31O2iZUBrV/XSUQ ZStzbLeRHGeUmTPggI22T3QCN3LPoEUNTR+fvaJOO2Z7/B2eAZOSHoUll/mvcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0vSc0YbZz375 for ; Tue, 27 Jan 2026 18:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f878 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:44:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: f1c08b611124 - stable/14 - ctld: Write the pidfile once after forking List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f1c08b6111246ed390319d3655a0d20a4e999c71 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:44:00 +0000 Message-Id: <69790770.f878.615daa20@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f1c08b6111246ed390319d3655a0d20a4e999c71 commit f1c08b6111246ed390319d3655a0d20a4e999c71 Author: John Baldwin AuthorDate: 2025-02-05 19:53:14 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:15:56 +0000 ctld: Write the pidfile once after forking Don't rewrite the pidfile each time main_loop is called. PR: 284282 Reported by: asomers Reviewed by: asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48768 (cherry picked from commit 7bad3c3e5f1c8b4d9e620bb2943299d4a30f3c86) --- usr.sbin/ctld/ctld.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c index b327fb8f003b..6729331569c5 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -2382,7 +2382,7 @@ handle_connection(struct portal *portal, int fd, } static void -main_loop(struct conf *conf, bool dont_fork) +main_loop(bool dont_fork) { struct kevent kev; struct portal *portal; @@ -2394,8 +2394,6 @@ main_loop(struct conf *conf, bool dont_fork) #endif int error, client_fd; - pidfile_write(conf->conf_pidfh); - for (;;) { if (sighup_received || sigterm_received || timed_out()) return; @@ -2763,12 +2761,14 @@ main(int argc, char **argv) conf_delete(oldconf); oldconf = NULL; + pidfile_write(newconf->conf_pidfh); + /* Schedule iSNS update */ if (!TAILQ_EMPTY(&newconf->conf_isns)) set_timeout((newconf->conf_isns_period + 2) / 3, false); for (;;) { - main_loop(newconf, dont_daemonize); + main_loop(dont_daemonize); if (sighup_received) { sighup_received = false; log_debugx("received SIGHUP, reloading configuration");