From nobody Sun Jun 1 19:54:02 2025 X-Original-To: dev-commits-src-all@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 4b9SNB4CMPz5y5lt; Sun, 01 Jun 2025 19:54:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9SNB33Gkz3t66; Sun, 01 Jun 2025 19:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807642; 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=h0+9HEclfSyN+Ag/Dv3u6peIdC/v7TgV6dByoVBOKhk=; b=ADBlqFVo/occRTtzyXMduea3SzCqBGmNbBEQ0+vtXTpYq5wGfbsdMt0evjH7FC0+403sS3 mPUSpqL4LrxqZnzx+tvjtj/nHsHN22DLvHhh9nwQvPKEp8yAOIkw17Bp2lH6hnb3lniA3S Tm74cI311QnDBGNt1irn3eQkuE/nwugYFnfsn9NVwJ3WU98nP2ZF6KOASzW8AoCOBnJWWS ynRXIC2sIfcentgg4sQVu8d8pC453ULNaeoLxfTafpKKxNctsrT+Gt8mRZrdpca9h7vN0y 5SVqyq6hjtvNiH2wIBGRt4Jt+66Dpy//zVgFnz8r4kIVMnt1C1r/QVZVGMRpWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807642; 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=h0+9HEclfSyN+Ag/Dv3u6peIdC/v7TgV6dByoVBOKhk=; b=G3LrzXUUiXtDWHQCkGh6ST4+HanIHhUjinUqYd+vjba2vB5ylvmaxa/bRRHs5tFI8nrLHx H5cKFGL5i+L7NKtv5U9E+a9I6NnKuitLaleWocMJe6CX7Tn/7D/TQ+x9HPu/++cqtgp3q8 SJDRnOSpXMLAYhJBRetLD206pEfpRKWGxTmIPdkU7ztc8lIOKPamuPeYkmCXUqv+F92rJ0 wHDzUPLhtkqRaq6ALevWXsBRz5h2Apie5njP/CTLUiNNf+FNxqPDrxIXZDy4aHvDg8kZuC HEitGNQNoD7VLRxHiYr739RvI7BFCMY2mJFJIVqgU2VJl2GM0Yhvicl1h77Y2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807642; a=rsa-sha256; cv=none; b=x0MHzbmq54lWlqbVH9wBGLdZHjFzj3ieiw5jiE9SaJA+woHpknqWAOtZk7Q+mmhhVoReBv a6y12fPTLeo45PiU3sYT5dOI5/qnzyvEdJdKMRhxu3WERku/4xoxn3iJS53grNKRXwremj T6jLgez6etEM7E3nAngO2yPZznq+bMnopw3XoLZNIxEUS6Kwa3wPZa6QeLhClaWk9YxJiD wcx0flwcEh/mASYkV8mRe9RGmNH8rUR/p0ST02ZbrIhmwV4IO/i/6wEx1LEbs/yzGMYjPD xrZbvDNiyK9mbz2PiDaztMYZeybD+c8ijVomQC3v34+SL0L52A9H3V7eXDVSSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9SNB2SdFzdy1; Sun, 01 Jun 2025 19:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 551Js2hj046116; Sun, 1 Jun 2025 19:54:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Js2nS046113; Sun, 1 Jun 2025 19:54:02 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:54:02 GMT Message-Id: <202506011954.551Js2nS046113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 001fc46caa54 - stable/14 - file: Simplify an INVARIANTS check in _fdrop() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 001fc46caa5469c1693f5f64c801815cb0dedbf1 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=001fc46caa5469c1693f5f64c801815cb0dedbf1 commit 001fc46caa5469c1693f5f64c801815cb0dedbf1 Author: Mark Johnston AuthorDate: 2025-05-13 23:26:49 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:29 +0000 file: Simplify an INVARIANTS check in _fdrop() No functional change intended. MFC after: 1 week Sponsored by: Klara, Inc. (cherry picked from commit a2e22ed3420d92d9d98a1e9681b5c9b1fbe40fca) --- sys/kern/kern_descrip.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 2d1c0d4aea5f..56e8a14f71b3 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3701,13 +3701,10 @@ int __noinline _fdrop(struct file *fp, struct thread *td) { int error; -#ifdef INVARIANTS - int count; - count = refcount_load(&fp->f_count); - if (count != 0) - panic("fdrop: fp %p count %d", fp, count); -#endif + KASSERT(refcount_load(&fp->f_count) == 0, + ("fdrop: fp %p count %d", fp, refcount_load(&fp->f_count))); + error = fo_close(fp, td); atomic_subtract_int(&openfiles, 1); crfree(fp->f_cred);