From nobody Mon Nov 17 16:39:53 2025 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 4d9D493Mj4z6GXPX; Mon, 17 Nov 2025 16:39:53 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9D492Lk2z3TTH; Mon, 17 Nov 2025 16:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763397593; 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=lX99Pqabt10rCSWtMJ2ZVpbu0DExFGx8EnWHPDJZfdA=; b=rQvDalD3Bl5R6q532zhCFqatLNcy5xTR7UKspPDkX9ofj4PImdSgsGV99VKjuJfBYfH323 JvMeMrtDU5Ed2kCJEazQhRjzZS0xdojd5qqXxHnUyztjLkTzuqRJhyDg4mVDFw20BABqe2 Ic/6ocgJLCbeHqhtEUJVslgW5zNIccAgBD3hqIJjtPn+zj9hLWn8nqdsvqn9HTF/vHmPGI vLy82t7Cv3NQ0fN0hxI2EgLBKx9rI38O9gZmb8q6QtEdsIiZsiuU8CHq/vCkWzOZERyUn7 f1XkrD1yz1EBi6BrEsAk4WQnlg577B64ZUB3Tf56gmnO5fsp0RlQ5vrSkl+9Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763397593; 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=lX99Pqabt10rCSWtMJ2ZVpbu0DExFGx8EnWHPDJZfdA=; b=or2mS4RZS1KvWOcBrDyivRezPGw+cUt7nOMj7a5TtbEnJvJIBIIOQvjLN/SPrqxl/8SbVf TbjvzQSvIqvTVdutd5Jx3xc7hjInQ6pVFwDZjCSKoarMoy34CWcWY50jtofF8EXtAct64b M8Kzu8g+GYts9U7JaXX5WNFn5x5g/NPvgCyDFHpK+2fUGngaxnCrFk3EYX3CxW788f8kTB fff+r19eHGcuLZHOAybsyIXfnYwG+0PLBEDKjgcbmyTMAlL3ph2QnsLG7Q4uu/yRXDa3xJ ocxH1wUL+h2hpYeE+xTweKRXOW90BMqa/5i86+BZm2D7KZ59X4T99ElokE4YTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763397593; a=rsa-sha256; cv=none; b=veC24Dke3tqwU6PP/BNf17KqhPd3HlCdgczZt/VyIF7T9NlxAnc4FosFCR4gW5duAfYE+H CrqvroXaeAB8fZQlOc9XTIZzrgsT5AO/QaJ8rVYLQRoeHD9WFDly17bY3Kp7qFjQ5oPmCK axI11QRxHx7zm8voaBoFL7kLQjYwpUfQJ3VhgROQkyrJbqgTYUujJzg7DnlWqlrQdBtugg GWKBD79HS5pAlVoo0kcSQ7/GqCC799oHNwimQID07kOpxXI/QhGEaC84pTkXVWKbHwqodI wrSILC42W34trovDzW/kLPYsXoSnQIw3xscBC/aP5wyQaQeKeHQv4TIEhLELqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d9D491NTsz15k; Mon, 17 Nov 2025 16:39:53 +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 5AHGdril008835; Mon, 17 Nov 2025 16:39:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHGdrtr008832; Mon, 17 Nov 2025 16:39:53 GMT (envelope-from git) Date: Mon, 17 Nov 2025 16:39:53 GMT Message-Id: <202511171639.5AHGdrtr008832@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: e2956be814a1 - stable/13 - file: Simplify an INVARIANTS check in _fdrop() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e2956be814a1ae86d7b5f83144b517e54424da27 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e2956be814a1ae86d7b5f83144b517e54424da27 commit e2956be814a1ae86d7b5f83144b517e54424da27 Author: Mark Johnston AuthorDate: 2025-05-13 23:26:49 +0000 Commit: Mark Johnston CommitDate: 2025-11-17 14:29:25 +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 f51a1092114d..57ecf253f5be 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3718,13 +3718,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);