From nobody Tue Jul 15 12:53:09 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 4bhJyG5bNgz62Mpg; Tue, 15 Jul 2025 12:53:10 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bhJyG1F34z3V1c; Tue, 15 Jul 2025 12:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752583990; 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=eTVqgSg0X0pBtb9AcqXHIVpFNlCd+qZyeJxBzxu3Xp4=; b=q22HrxmosxtqwGxzJkXQ89IuwGDCJQ6GBaltNPrCUz0/m/k3L9UCcBWTUUAig9dmVuthYm 0cG+iHC2TfaiEhG7iMJcJZDkh3mBSKIJZ1ijRtsG69FpddrHajnNB3ThJJm4xu2cfS3AyN UMJ+/9dpKe4sgYu+r4wfQBgBQhu+GUdxQOwCUPPrJbWYdFDl7LWPnAZfQKUUWv223CiKeP CH2tPhC2rUcUT5gI8phvwlN/BWe2u2d3UQChH7JpvtG4+Q4DNXfxSeqe7RkAMR2pAvStqI vCEd16HWll4EabhEvz8Yu/lQp6GP2zULjIGRRXADY/oUEW0BqPrYJPG3x7jxBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752583990; 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=eTVqgSg0X0pBtb9AcqXHIVpFNlCd+qZyeJxBzxu3Xp4=; b=waCc9g90nHpylEBSjbiTBWvMXKw+DkmCuzIy8zC0rQLusUvzNzl0KTsGKnj6d/vt3n1Zd8 FBjwDGcl9in0eo9R3M2WTG3gd5Rqvr5/ZdTkn5H7Ia9NOcFf0p9G0GTDsqGeVn1Ws9SPZP Xz3py3t+ioD9Podd83pEt33H9KNH6hsJHGxGb8nwwzuSE5VAX/58PlMfumooD93q4jB1LO t2Sk4tfdApV1vzjOvhiE58DlKaYAU2l0GElZ0WS6cSDTiSb5o0mN7U3ToehhaJ5zm5N2Qr obTZgM5+ppRBfaVGbXtP47IPqMB4SJmRC8+BwdFLBjbNXiq3BvgINNQIxAmr+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752583990; a=rsa-sha256; cv=none; b=N9DELBq3QPQxy08vhvI66MJov+Pw2Lmh8sT9ePr9jcucMjFmT8PXeanV0qIfBE1dGCa22F RYW8sk1xPgzmBzlSJrkM28o2Gu2Gpv2gTQns2l09Vy/9w8K2Y2HyjMmFFSVBbpqIhPUA/x O/lbUuBhxXdCsqFN3fGLa0R0iFMenfud8K1sDqSP2h7PNM4gPe89kionGnsQpe0LGaUGsk ghSbR3i7cLtkmKnFL6wnFBNpP1XvAX5FmABnIQu2/PZTuvSJqRb/hNKIi4MdOXa0Nit0fC wxH4NFow38PquhNSoZafR4TXmbhzDnY/JrrkKJPVomNJoHtySvz1jh2/LN0IbA== 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 4bhJyG0k9MzhDb; Tue, 15 Jul 2025 12:53:10 +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 56FCrAfn045550; Tue, 15 Jul 2025 12:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56FCr91L045547; Tue, 15 Jul 2025 12:53:09 GMT (envelope-from git) Date: Tue, 15 Jul 2025 12:53:09 GMT Message-Id: <202507151253.56FCr91L045547@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: da84054f3a50 - main - fdescfs: Set *eofflag in fdesc_readdir() 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: da84054f3a508ceab4474e4a002c87813963cc84 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da84054f3a508ceab4474e4a002c87813963cc84 commit da84054f3a508ceab4474e4a002c87813963cc84 Author: Mark Johnston AuthorDate: 2025-07-15 00:38:21 +0000 Commit: Mark Johnston CommitDate: 2025-07-15 12:52:58 +0000 fdescfs: Set *eofflag in fdesc_readdir() Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51319 --- sys/fs/fdescfs/fdesc_vnops.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 676ea5de12b8..58a22b8bdc50 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -547,6 +547,8 @@ fdesc_readdir(struct vop_readdir_args *ap) fmp = VFSTOFDESC(ap->a_vp->v_mount); if (ap->a_ncookies != NULL) *ap->a_ncookies = 0; + if (ap->a_eofflag != NULL) + *ap->a_eofflag = 0; off = (int)uio->uio_offset; if (off != uio->uio_offset || off < 0 || (u_int)off % UIO_MX != 0 || @@ -559,7 +561,12 @@ fdesc_readdir(struct vop_readdir_args *ap) fcnt = i - 2; /* The first two nodes are `.' and `..' */ FILEDESC_SLOCK(fdp); - while (i < fdp->fd_nfiles + 2 && uio->uio_resid >= UIO_MX) { + while (uio->uio_resid >= UIO_MX) { + if (i >= fdp->fd_nfiles + 2) { + if (ap->a_eofflag != NULL) + *ap->a_eofflag = 1; + break; + } bzero((caddr_t)dp, UIO_MX); switch (i) { case 0: /* `.' */