git: de19a7d54d30 - stable/15 - Revert "zfs readdir: if there were no dirents to copy out, return EINVAL same as UFS"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 22 Sep 2025 04:53:49 UTC
The branch stable/15 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=de19a7d54d30483343dbc526af8e0b4cb83892f7
commit de19a7d54d30483343dbc526af8e0b4cb83892f7
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2025-09-19 17:05:08 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2025-09-21 23:25:16 +0000
Revert "zfs readdir: if there were no dirents to copy out, return EINVAL same as UFS"
PR: 289485, 289678
(cherry picked from commit 932e404f12c172e3d4ec47dedee02da400ef8f92)
---
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
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 174141a5deab..6b55329da7a7 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,7 +1695,6 @@ 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;
@@ -1744,7 +1743,6 @@ 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();
@@ -1924,7 +1922,7 @@ update:
kmem_free(outbuf, bufsize);
if (error == ENOENT)
- error = orig_resid == zfs_uio_resid(uio) ? EINVAL : 0;
+ error = 0;
ZFS_ACCESSTIME_STAMP(zfsvfs, zp);