From nobody Mon Aug 18 13:30:37 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 4c5D9n6fv6z63h4t; Mon, 18 Aug 2025 13:30:37 +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 4c5D9n2j48z3w5Z; Mon, 18 Aug 2025 13:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755523837; 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=N8Ut6hvXw+LV/FozDjFURGKCE0OfHnhNUSiwWIEHuNw=; b=XeofKnSXoUEIUEBQqWkwEBEFpir9/HjZ22K0eZ3AoDwCs8+Kwo77bnwf06kjd9CEQAqNw3 9LnrgnlA1VBGcLWdPNOSc8MUkw1Zu++8/C5XQp8CtpJvjMMscY9gB15irEpCn0xkGwyNVR 7GlV+lpUQbqAMKl4lN+BmrRB5djJtrP39VJEKOLqoPUAa4nzyPkh7QMv+7Ey2ZKlQbJZul AYZZLYu6shfrhCKKcV1lDTGVWAggvzd31oI80W7t79VgAl3v8lQ+2ufUyIWq3/6nERBXSD V1k1oTjrqtDJEyJMzjl8qFV45p/eE+Wwy6A8zfwRgcVTk+kH4k+1prDebqFT/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755523837; 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=N8Ut6hvXw+LV/FozDjFURGKCE0OfHnhNUSiwWIEHuNw=; b=F2G5oxRLUi8PJrE4m83gMbUuLifs4F0IS3SslHQXVAxFqnEdbI0pn4n95U0ez63RwZiQVl Q6SG4MkOPHfDtJa1/Typ/sQtTP3HXRh6C6oeOMc2BKwa91qpv+NdRFLkuDsVmU/QRs/nlU /XpsmPDZWpR7a+KVzpP8vDuIoTl1C1nBrr8a4WF8GrV/I18PZgjVNb7Pnu9C7RWtm4M4wF hk7TB+PSTXFb5FrZTp7JVPExJ32qesXRJi+mYYzC/Uwe/UmbKXVoLF84GYiHEpM6g5otHc 4iFCqggtnWmTg38C60sTn3GYW4tUny6jjQkks9UuL6v9dxrSAPEyprBc0COI+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755523837; a=rsa-sha256; cv=none; b=OZhjo1OMG8/shBOQx83hjM357M8afcjJCoKEm/Y5CDx/wUL7PDr6mIpcWUVwdU7FeTSArS X0QIgjQVMt8eX0gb2YVpBtI+mcO6DtGhYS8QOEHv8vtexfG7QdVIfzZ31oIaWZHSwhgDgl 3xtBTTC0xujRAVyetIzUw9ebv5+zJuLxn2Aq6CkqV6xewF6oXRlN+NZ9qxU6lXIaDSs+oh l31fm6CWyl/VzA/TjjCCYkjQv3h4g6VUnsFyaluTTG+vmqToiKU3VTs1gmL+XX+VynKl6N dj77L2ejc1Er2CEyockPuPD5bjtFAd+BlLQRi1SWFonwFnv+VJ4bp2GhhazVSw== 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 4c5D9n24dSzyGB; Mon, 18 Aug 2025 13:30:37 +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 57IDUbQJ042361; Mon, 18 Aug 2025 13:30:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IDUbrU042358; Mon, 18 Aug 2025 13:30:37 GMT (envelope-from git) Date: Mon, 18 Aug 2025 13:30:37 GMT Message-Id: <202508181330.57IDUbrU042358@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9a3edc8d5dbc - main - zfs readdir: if there were no dirents to copy out, return EINVAL same as UFS 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a3edc8d5dbcb896179cfa7867f961184e146a09 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9a3edc8d5dbcb896179cfa7867f961184e146a09 commit 9a3edc8d5dbcb896179cfa7867f961184e146a09 Author: Konstantin Belousov AuthorDate: 2025-08-16 01:33:09 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-18 13:30:04 +0000 zfs readdir: if there were no dirents to copy out, return EINVAL same as UFS Reviewed by: allanjude, markj, rmacklem Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D51930 --- 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 6b55329da7a7..174141a5deab 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 @@ -1695,6 +1695,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; @@ -1743,6 +1744,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; zap = zap_attribute_long_alloc(); @@ -1922,7 +1924,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);