From nobody Mon Aug 25 08:57:20 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 4c9PnF1dRzz65Rcx; Mon, 25 Aug 2025 08:57:21 +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 4c9PnD68MMz3q3j; Mon, 25 Aug 2025 08:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756112240; 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=Vo+uT/83u8k0l5w7XymP+wU7K55XenXR3a4gpLmEd9I=; b=Yq03EF4Cal+v345+H2pfVShGg+OfpN7rboUZd1Ldwg23gEujumbx80RzmqRDBSUDJKeCU5 mHYYkfSxUeX+8WVV5fDp8zIQnb5oqYSeWX8vdcDaaNS+d2rVo5YIbLvNN8q8wqycp/t69Q VWANm+IenI8Mg3lboDQvd4fLAXiTC/RWvLJnx6sS2EQzzFeIW4er5XCQ0G93MLovVFoZ04 csOFA53lfQdVyOVgpZu54leCT/StYqIY64klFT1cLixJ9PIW+mHf7SJa1Qun+a/rAcH26S Hx08AAsLH98XI8lndpbMBpu21JhIfs3WX1wsukcGCZzshKfW86Sm38gWF+xZGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756112240; 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=Vo+uT/83u8k0l5w7XymP+wU7K55XenXR3a4gpLmEd9I=; b=fUB5Fjzu4RjmmWkSxN4CGSDPH4xq09ELpnmfGfGz8SWQGzuctTzdXgQzcjhLyk/RDnDjBE ts+r+JSEdUZzEk+ZQEJWPB1UYjq520jVdzOLu7z3t8LwKQvuIV11olrb9Aw9ZGX4N50JRy /Vk+sT26bhu1ato9JnrechrkQ5eN5fyHJQpwoP11erE77B7jONGPyi5rc93WhoWsJ9ci02 915Q3FFH9xo8FqS/ZptfjagFzTceWm93pNaWcZmth7gP1aw+N4nbgZhzndZasMlGB2EVdf DX2cATwkcZalcOn4QsQMrwr7hrR5Iy/07dK53CU8ycwUjNbxYsvdsz6mFxyBcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756112240; a=rsa-sha256; cv=none; b=wUkXG60Dvmjmln2SWzuxBVi2orr9DCu1Cbc3qVakaYa8a+4XY4JixU8WAG3sQVZe5qjE4f Hl3NI0J05F4KWhiAa8c3kDA4ZzDS8pQN8qP5+mT7AnX+N7OS8S2Q7iU7nmy+bFVN7KNNal eg+39mv6gNKjs7G2+g14RntD5aEO7xcRKevh8kcH/i4UY3+p3W/HPDdQZKTJ97+EBnqmA4 nNcMPwCaI2SsJcsPLx07FNW/guCDpKx2fH6oWSTVygFRz0A62ZYBKPCA5IxTUxJVudN4yR 4vcjOTa+0x3S0OaHMBoMAw6rHGfM/XbAOVGmSV8T50pm/OPDvCHZrE+AuI441Q== 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 4c9PnD5jw8zjtg; Mon, 25 Aug 2025 08:57:20 +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 57P8vKtR016647; Mon, 25 Aug 2025 08:57:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57P8vKJh016644; Mon, 25 Aug 2025 08:57:20 GMT (envelope-from git) Date: Mon, 25 Aug 2025 08:57:20 GMT Message-Id: <202508250857.57P8vKJh016644@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: 56e00aca338c - stable/14 - zfs readdir: if there were no dirents to copy out, return EINVAL same as UFS 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/14 X-Git-Reftype: branch X-Git-Commit: 56e00aca338cc45c3fbd4f95c2a8bb8dfac1efb7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=56e00aca338cc45c3fbd4f95c2a8bb8dfac1efb7 commit 56e00aca338cc45c3fbd4f95c2a8bb8dfac1efb7 Author: Konstantin Belousov AuthorDate: 2025-08-16 01:33:09 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-25 08:42:18 +0000 zfs readdir: if there were no dirents to copy out, return EINVAL same as UFS (cherry picked from commit 9a3edc8d5dbcb896179cfa7867f961184e146a09) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index c477ad55dbaa..f87182d1c484 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -1561,6 +1561,7 @@ zfs_readdir(vnode_t *vp, zfs_uio_t *uio, cred_t *cr, int *eofp, objset_t *os; caddr_t outbuf; size_t bufsize; + ssize_t orig_resid; zap_cursor_t zc; zap_attribute_t zap; uint_t bytes_wanted; @@ -1609,6 +1610,7 @@ zfs_readdir(vnode_t *vp, zfs_uio_t *uio, cred_t *cr, int *eofp, error = 0; os = zfsvfs->z_os; offset = zfs_uio_offset(uio); + orig_resid = zfs_uio_resid(uio); prefetch = zp->z_zn_prefetch; /* @@ -1786,7 +1788,7 @@ update: kmem_free(outbuf, bufsize); if (error == ENOENT) - error = 0; + error = orig_resid == zfs_uio_resid(uio) ? EINVAL : 0; ZFS_ACCESSTIME_STAMP(zfsvfs, zp);