From nobody Sun Feb 13 13:07:18 2022 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 3AD3F19BC9E6; Sun, 13 Feb 2022 13:07:19 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JxSLZ6YQYz3JHm; Sun, 13 Feb 2022 13:07:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644757639; 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=lBHryDCAYtBi3mzqPaiyuSsGH8J4WmHXKsmeTsnZlkg=; b=o4NacUD5dDJvIvXQTYV5k6lTHSNolTmzeZn/W3QzGAolS/wiJPi7blhQl6wetxAuytGt3L 3BfkMaU86jfpIPCzg354oUbKesjgovM7GAaUpg7qX9lVPlGk+reAJ6KKdvznRbk9jnwpBi m7LLKMqVB6Lif1jPtoxWFF1bpUBcOe7g+5DSt99QpA9DHjHKEN6QBA96JTuPx81chZklpH fv2YISy0n4ZqF5z0Y9nXTBYfHGC2HaHfp/DV0yooeUkzfX6R6sMaPixtRZhSub8QNFYXTD Kc52w8LvdstCRF4eFhDAAVKl/AXpn1oDPFPu8n1FWa4t+BkIkt0SaYEcFx28JQ== 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 A6B4D1BD88; Sun, 13 Feb 2022 13:07:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21DD7InM074009; Sun, 13 Feb 2022 13:07:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21DD7I8i074008; Sun, 13 Feb 2022 13:07:18 GMT (envelope-from git) Date: Sun, 13 Feb 2022 13:07:18 GMT Message-Id: <202202131307.21DD7I8i074008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 809f3121be66 - main - fd: assign fd_freefile early when copying 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 809f3121be660ac9f0605dd347b41b1b5e9ab195 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644757639; 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=lBHryDCAYtBi3mzqPaiyuSsGH8J4WmHXKsmeTsnZlkg=; b=bH/Qb5dXqyjgnnAIrD8dLeb7QWo1Zl6gtueVcRs3nICOcvPKND4vbBa19HintoziqBbwoA 0uBaM0lQ8jQv2ljmd/A6vldslAHE3ixPO21ksCMcwYrzO+Ynmz+iJYqgVGmhOfTU7xRsRO vlF7ll0aFnx2Ii5Jgu4obBcso+VcgDrDSTJPoc/DSw1GRrOm91kV/WZuVSkDczW2xbYqqg dOahcW5XZxXbTVn9T8Kr9SYYVJR+MRwugrRw/fGccpaaI9ZLhMJlzrk6GDR5Q79c2nXxV3 0Gn87e0vwmynB1sv23oUuBxVcBiunT6cOUwMTJDDxO2dKm37+xR5UxpxONEslA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644757639; a=rsa-sha256; cv=none; b=gZLy+6tkR5z9UFJyyYplM2XCW9od7Nvnhe5KS02xm/b0TiuUZZSK+JhrS1xXhPZ58o3N19 OCffA32Jir8B5jn3tXLDEqzOm0gCxmZXCHQmvxghjwDldzjWU07wp+e8RbjrQcufcO+tPI vH+mSaNklE5E+ttL+mHh8L+ROBMQGvjLFtm8EkTxuJdogvkpFtnk2Okh552G1IvfzeIisy wHLF52icUoxaAuihrQ77P6OveJ1EKoHkpkuxEMhEt8IVgybp1slO+/uRho0KY4b5vwiZYs iwIl39MtKkvvR1lQXWb2SyvkGLlz67czWOHFCM3yuv8b0m9A+w9nJTRJuZ6Z9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=809f3121be660ac9f0605dd347b41b1b5e9ab195 commit 809f3121be660ac9f0605dd347b41b1b5e9ab195 Author: Mateusz Guzik AuthorDate: 2022-01-29 22:12:42 +0000 Commit: Mateusz Guzik CommitDate: 2022-02-13 13:07:08 +0000 fd: assign fd_freefile early when copying This is to simplify an upcomming change. --- sys/kern/kern_descrip.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 1dc0f1e647d6..feb35c28cba1 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2356,13 +2356,13 @@ fdcopy(struct filedesc *fdp) FILEDESC_SLOCK(fdp); } /* copy all passable descriptors (i.e. not kqueue) */ - newfdp->fd_freefile = -1; + newfdp->fd_freefile = fdp->fd_freefile; for (i = 0; i <= lastfile; ++i) { ofde = &fdp->fd_ofiles[i]; if (ofde->fde_file == NULL || (ofde->fde_file->f_ops->fo_flags & DFLAG_PASSABLE) == 0 || !fhold(ofde->fde_file)) { - if (newfdp->fd_freefile == -1) + if (newfdp->fd_freefile == fdp->fd_freefile) newfdp->fd_freefile = i; continue; } @@ -2371,8 +2371,7 @@ fdcopy(struct filedesc *fdp) filecaps_copy(&ofde->fde_caps, &nfde->fde_caps, true); fdused_init(newfdp, i); } - if (newfdp->fd_freefile == -1) - newfdp->fd_freefile = i; + MPASS(newfdp->fd_freefile != -1); FILEDESC_SUNLOCK(fdp); return (newfdp); }