From nobody Tue May 13 23:33:43 2025 X-Original-To: dev-commits-src-main@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 4Zxt8S1K4Nz5w99q; Tue, 13 May 2025 23:33:44 +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 4Zxt8R6KrGz3JKc; Tue, 13 May 2025 23:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747179223; 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=lqyTEj/K/VIJhqwjS3C+6Si/uAoWB0cEub9ryRDsKVo=; b=CgjfT6vaBIV0qBHMZDSntKk57bNtfwDan1DHJeWZxLtrSjjaIThnr7qkpa3JV49wT3Onma qMAQ6nfWm5j7w0hEKEPX98UZytYXK0/oa0MB7VDpAZfAmPd4OrfKuZn7QQgjs5o30LthdH 68/PmZpn+FYkaD3TNtiHb/phy3SFVh2pvszm3PVkiLdTBmSH8x2kWiFwU+Z2KY6NkIFvP3 fdlN/D56LK4YR8JYOeyJFEQHpgM97locDOMdCMtWO2yckiU9Lp+BRWEkNK00H7WB5r8L9J pSDoSoSDXRohGWDjZWkIerhopn2CBIFnYKA8nVsf0CJEgHVMyKDvdYYBTZivkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747179223; 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=lqyTEj/K/VIJhqwjS3C+6Si/uAoWB0cEub9ryRDsKVo=; b=wrXvPobSM+cZT3jXktWiodcvBwKpHiAqv4ERcR6Ic5SZ11tOBzPKioTLyo3T7cSs/K7HsV +JKZzwn3vz7pjg+TZO88xAl+lOXRN79/hUl+8pi/00I+ygF5hKDYz7dSsufMLJmbQLa0Bs YFnNXOtBgmfq0JnEYaTBrfuKPQ0QmsPhbK75vB9tFb1hSd+I2fzIXZNouakFP3dOlyc5uq cHS6aBmAJuvz7YAbBfusFVAWgSWdxkNMn9JSh8aCYhT4a9+Z1tIlfeBPtTBwCQUzeD03AK 5ORbiSXHEQNVJDaQOo88cNowK2un/svq6cAoKJxTOFmJWsmh54dSDqPqsfQfKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747179223; a=rsa-sha256; cv=none; b=NPI38IXuIvdI85Ib6+jSvKBAi7bssoGqnIUPWBydvd/y70nkqW8YbYcR05BbY7Yt0gFpuE nhu/sURtuDYUJqz17P7HOYBtFLEMsJL64FKqPusYaVV/mJU4zmrwV1pB4Nv7SqGBb+RJfB 3Z7ZZdkRSikX23AmjjDE73z6+3h4PDJkNR2iiJJVWJ3Jczmk8gADdJBUkQw7QYUjmXOmBO 2GQ+eFPbMj1XhNEKra64vL6i5sOyplaXmiad6lie0Xgqu5zUwPSka5GUqS9rj/KxB+vyY+ ichfc07gkj0FIbhbKPTsXqVFLPbnXVtlccGpyuXNdsFSmXCu8rb3XzljUA7C+Q== 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 4Zxt8R4tzYz17B4; Tue, 13 May 2025 23:33:43 +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 54DNXhM6095153; Tue, 13 May 2025 23:33:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DNXhDL095150; Tue, 13 May 2025 23:33:43 GMT (envelope-from git) Date: Tue, 13 May 2025 23:33:43 GMT Message-Id: <202505132333.54DNXhDL095150@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a2e22ed3420d - main - file: Simplify an INVARIANTS check in _fdrop() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a2e22ed3420d92d9d98a1e9681b5c9b1fbe40fca Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a2e22ed3420d92d9d98a1e9681b5c9b1fbe40fca commit a2e22ed3420d92d9d98a1e9681b5c9b1fbe40fca Author: Mark Johnston AuthorDate: 2025-05-13 23:26:49 +0000 Commit: Mark Johnston CommitDate: 2025-05-13 23:27:19 +0000 file: Simplify an INVARIANTS check in _fdrop() No functional change intended. MFC after: 1 week Sponsored by: Klara, Inc. --- 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 f007b22f90ec..cbffe592554d 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3699,13 +3699,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);