Page MenuHomeFreeBSD
Differential D51930

zfs: fixes for readdir
ClosedPublic
Actions

Authored by kib on Aug 16 2025, 1:43 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Oct 16, 1:08 PM
Unknown Object (File)
Thu, Oct 16, 1:07 PM
Unknown Object (File)
Fri, Oct 10, 4:19 AM
Unknown Object (File)
Thu, Oct 9, 11:02 PM
Unknown Object (File)
Thu, Oct 9, 11:02 PM
Unknown Object (File)
Thu, Oct 9, 11:02 PM
Unknown Object (File)
Thu, Oct 9, 11:02 PM
Unknown Object (File)
Thu, Oct 9, 7:25 PM
View All 43 Files
Subscribers
delphij
imp

Details

Reviewers
rmacklem
markj
allanjude
Commits
rG9a3edc8d5dbc: zfs readdir: if there were no dirents to copy out, return EINVAL same as UFS
rGadba3e087173: zfs readdir: set *eofp to 1 on eof
rGcead6157cc1b: zfsctl_root_readdir: if there were no dirents to copy out, return EINVAL
rG1031208ebceb: zfsctl_root_readdir(): properly set eof
Summary
zfs control dir: properly set eof


zfs readdir: set *eofp to 1 on eof


zfs readdir: if there were no dirents to copy out, return EINVAL same as UFS

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kib created this revision.Aug 16 2025, 1:43 AM
Herald added subscribers: delphij, imp. · View Herald TranscriptAug 16 2025, 1:43 AM
kib requested review of this revision.Aug 16 2025, 1:43 AM
rmacklem added inline comments.Aug 16 2025, 1:57 AM
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c
722

If you are returning some entrie(s) but the
last one failed with ENAMETOOLONG, doesn't
that mean there are still entrie(s) to read?
(In other words, I would have said *eofp should
be 0 for this case. ufs_readdir() doesn't set eofflag
when it returns EINVAL, if I read the code correctly?)

kib updated this revision to Diff 160424.Aug 16 2025, 2:46 AM
kib marked an inline comment as done.

Do not set *eofp when not at EOF, but copyout failed due to ENAMETOOLONG.

rmacklem accepted this revision.Aug 16 2025, 4:48 AM
This revision is now accepted and ready to land.Aug 16 2025, 4:48 AM
allanjude accepted this revision.Aug 17 2025, 5:42 PM
markj accepted this revision.Aug 18 2025, 12:59 PM
Closed by commit rG1031208ebceb: zfsctl_root_readdir(): properly set eof (authored by kib). · Explain WhyAug 18 2025, 1:31 PM
This revision was automatically updated to reflect the committed changes.
kib added a commit: rG1031208ebceb: zfsctl_root_readdir(): properly set eof.
kib added a commit: rGcead6157cc1b: zfsctl_root_readdir: if there were no dirents to copy out, return EINVAL.
kib added a commit: rGadba3e087173: zfs readdir: set *eofp to 1 on eof.
kib added a commit: rG9a3edc8d5dbc: zfs readdir: if there were no dirents to copy out, return EINVAL same as UFS.
kib added a reverting change: rG932e404f12c1: Revert "zfs readdir: if there were no dirents to copy out, return EINVAL same….Fri, Sep 19, 5:12 PM
kib added a reverting change: rG72924ce99c7f: Revert "zfsctl_root_readdir: if there were no dirents to copy out, return….

Revision Contents
Changeset List

PathSize
sys/
contrib/
openzfs/
module/
os/
freebsd/
zfs/
2 lines

Diff 160547

View Options

sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c

Loading...