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)
	Wed, Jun 17, 12:43 PM

	Unknown Object (File)
	Jun 4 2026, 8:58 AM

	Unknown Object (File)
	May 30 2026, 10:25 PM

	Unknown Object (File)
	May 17 2026, 7:19 AM

	Unknown Object (File)
	May 15 2026, 1:52 AM

	Unknown Object (File)
	May 14 2026, 9:30 PM

	Unknown Object (File)
	May 14 2026, 1:25 PM

	Unknown Object (File)
	May 14 2026, 1:22 PM

Subscribers

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 Skipped

Unit

Tests Skipped

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
720	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?)

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….Sep 19 2025, 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

Path

Size

sys/

contrib/

openzfs/

module/

os/

freebsd/

zfs/

42 lines

6 lines

Diff 160424

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

Loading...

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

Loading...