From nobody Mon Sep 22 04:53:50 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 4cVW3M06bjz68ZXC; Mon, 22 Sep 2025 04:53:51 +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 4cVW3L6XBdz3Ncw; Mon, 22 Sep 2025 04:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758516830; 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=F2ZkE2KaincyMHPj7kqtqAXG7BDir5UazXY74MDXGks=; b=DNtaadOhhBLnvQCGphbnSnMjSU1YrI3PYB9ORfQMB9A5YebiuT7SDiP+M7snA+SvCNPGWL F0DZH4PPv4wr9LEZCA0ra5OyeeSppciNfm0Ql3/eWDDotoJwbU3l0GpppPnAVeGAE3tfWs X8gzjVL6qXJRWnKvlLYHtdWkyOcj0TSabcEtbo8UynlSzQ7h0eHPbRud1u0TdqA5fE/f8/ tXGVw4+WxWksALVO0zOyaEna98h8KOfD8MMBDZKVshAl1dBGR1Co0WNaEIdc2+n03ccHXW BAzKCLX5hhBX8P+0veGN4JU0dPDdVNeQSEWjgHcOjX1gQzI+0LFYyXlp5D2N5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758516830; 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=F2ZkE2KaincyMHPj7kqtqAXG7BDir5UazXY74MDXGks=; b=QduQ5+DOgBs8kMIzocxgMNr1w4pztS9FTX5rmLqO+Vpu7R7rgxK/rW1QqE6hOSsmUBK+15 Smn6aHbSTrOc7HqRCqsR4CRt8RhJ8wDrhSkiJw288VmH7WjqN9CsLdwD3jUt7YsBw7J45e DZi2o1bzYRkHWYEtt2hW27GonKfWUDa8Ve0wUsHq5nA0Qlj8Gx/QwWt70w3ROXQ0DSl86P sNJNKq7KFdL+xvMYHeXKpca/OnF843doOdiSvmE/eAfSmG729aeyQFETmVl1CDQVSnd5qN WFSSMYzOS95IMtiALtxTSgcFLdP1gQBsgSMVJs5P+ZQrdXn9mzhX2/HevQB5mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758516830; a=rsa-sha256; cv=none; b=bRu5hpwMfgiRWYUJNNKSn+9Uvq8N3Z6AsXN+p8pEs6sBTiSaCMcpKjb/Mx1UACEYr7gjDX xQvHoFPBTYGe+kgtNArMZc2WdusiXlo5l+/n+dv6sFZa4ny1lPO/i2cuc/cCtvpYpMky7Q M3zOmdS1FPYOm0IsBMoyySqnVq2DoF+fbVNPRaw84pl+k3mG1cctbCGJHbaLAjpApX3WKq tWRZKsWrW3qlDT19W8YzViUPbn0ApASt+Lpo0GB6NuTbDlQ6WhjavWgE8AVqzTrtWcsdJR fxAR7/u5SZWwWcWZxgPdvLFjrIqZdfdKRDdn13duxJA2P0SUfyCrIF+L3Dcbhg== 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 4cVW3L5rKMzmTj; Mon, 22 Sep 2025 04:53:50 +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 58M4roku092699; Mon, 22 Sep 2025 04:53:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58M4roQs092696; Mon, 22 Sep 2025 04:53:50 GMT (envelope-from git) Date: Mon, 22 Sep 2025 04:53:50 GMT Message-Id: <202509220453.58M4roQs092696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 23004dbe58f6 - stable/15 - Revert "zfsctl_root_readdir: if there were no dirents to copy out, return EINVAL" 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 23004dbe58f62be4e9646ed96192ad4aa556a3eb Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=23004dbe58f62be4e9646ed96192ad4aa556a3eb commit 23004dbe58f62be4e9646ed96192ad4aa556a3eb Author: Konstantin Belousov AuthorDate: 2025-09-19 17:06:54 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-21 23:25:16 +0000 Revert "zfsctl_root_readdir: if there were no dirents to copy out, return EINVAL" (cherry picked from commit 72924ce99c7f177db486bd2764a76bcf25892a17) --- .../openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 40 ++++++++-------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index a222c5de4a2a..4de48e013ec4 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -674,7 +674,6 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) zfs_uio_t uio; int *eofp = ap->a_eofflag; off_t dots_offset; - ssize_t orig_resid; int error; zfs_uio_init(&uio, ap->a_uio); @@ -694,11 +693,13 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) return (0); } - orig_resid = zfs_uio_resid(&uio); error = sfs_readdir_common(zfsvfs->z_root, ZFSCTL_INO_ROOT, ap, &uio, &dots_offset); - if (error != 0) - goto err; + if (error != 0) { + if (error == ENAMETOOLONG) /* ran out of destination space */ + error = 0; + return (error); + } if (zfs_uio_offset(&uio) != dots_offset) return (SET_ERROR(EINVAL)); @@ -711,11 +712,8 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) entry.d_reclen = sizeof (entry); error = vfs_read_dirent(ap, &entry, zfs_uio_offset(&uio)); if (error != 0) { -err: - if (error == ENAMETOOLONG) { - error = orig_resid == zfs_uio_resid(&uio) ? - EINVAL : 0; - } + if (error == ENAMETOOLONG) + error = 0; return (SET_ERROR(error)); } if (eofp != NULL) @@ -1060,21 +1058,17 @@ zfsctl_snapdir_readdir(struct vop_readdir_args *ap) zfs_uio_t uio; int *eofp = ap->a_eofflag; off_t dots_offset; - ssize_t orig_resid; int error; zfs_uio_init(&uio, ap->a_uio); - orig_resid = zfs_uio_resid(&uio); ASSERT3S(vp->v_type, ==, VDIR); error = sfs_readdir_common(ZFSCTL_INO_ROOT, ZFSCTL_INO_SNAPDIR, ap, &uio, &dots_offset); if (error != 0) { - if (error == ENAMETOOLONG) { /* ran out of destination space */ - error = orig_resid == zfs_uio_resid(&uio) ? - EINVAL : 0; - } + if (error == ENAMETOOLONG) /* ran out of destination space */ + error = 0; return (error); } @@ -1092,13 +1086,9 @@ zfsctl_snapdir_readdir(struct vop_readdir_args *ap) dsl_pool_config_exit(dmu_objset_pool(zfsvfs->z_os), FTAG); if (error != 0) { if (error == ENOENT) { - if (orig_resid == zfs_uio_resid(&uio)) { - error = EINVAL; - } else { - error = 0; - if (eofp != NULL) - *eofp = 1; - } + if (eofp != NULL) + *eofp = 1; + error = 0; } zfs_exit(zfsvfs, FTAG); return (error); @@ -1111,10 +1101,8 @@ zfsctl_snapdir_readdir(struct vop_readdir_args *ap) entry.d_reclen = sizeof (entry); error = vfs_read_dirent(ap, &entry, zfs_uio_offset(&uio)); if (error != 0) { - if (error == ENAMETOOLONG) { - error = orig_resid == zfs_uio_resid(&uio) ? - EINVAL : 0; - } + if (error == ENAMETOOLONG) + error = 0; zfs_exit(zfsvfs, FTAG); return (SET_ERROR(error)); }