The branch stable/14 has been updated by asomers:
URL:
https://cgit.FreeBSD.org/src/commit/?id=0a0d323157cb54970b5c525db307c17c2e7ff864
commit 0a0d323157cb54970b5c525db307c17c2e7ff864
Author: Alan Somers <asom...@freebsd.org>
AuthorDate: 2025-06-05 20:32:22 +0000
Commit: Alan Somers <asom...@freebsd.org>
CommitDate: 2025-07-23 22:56:33 +0000
fusefs: delete dead code
These lines have been commented out ever since the first import of fuse.
The intention seems to be for the original developer to experiment with
different error handling strategies, but they're very obsolete by now.
Delete them.
MFC after: 2 weeks
Sponsored by: ConnectWise
(cherry picked from commit 7ce93195ddb30b371022ae3adbd9bd24189e1444)
---
sys/fs/fuse/fuse_ipc.c | 5 -----
sys/fs/fuse/fuse_vnops.c | 4 +---
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/sys/fs/fuse/fuse_ipc.c b/sys/fs/fuse/fuse_ipc.c
index 21787b6b543a..379306f8ef2e 100644
--- a/sys/fs/fuse/fuse_ipc.c
+++ b/sys/fs/fuse/fuse_ipc.c
@@ -444,11 +444,6 @@ retry:
if (err == EWOULDBLOCK) {
SDT_PROBE2(fusefs, , ipc, trace, 3,
"fticket_wait_answer: EWOULDBLOCK");
-#ifdef XXXIP /* die conditionally */
- if (!fdata_get_dead(data)) {
- fdata_set_dead(data);
- }
-#endif
err = ETIMEDOUT;
fticket_set_answered(ftick);
} else if ((err == EINTR || err == ERESTART)) {
diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c
index 423ce05a595f..88bf20382c05 100644
--- a/sys/fs/fuse/fuse_vnops.c
+++ b/sys/fs/fuse/fuse_vnops.c
@@ -1937,10 +1937,8 @@ fuse_vnop_readdir(struct vop_readdir_args *ap)
if (fuse_isdeadfs(vp)) {
return ENXIO;
}
- if ( /* XXXIP ((uio_iovcnt(uio) > 1)) || */
- (uio_resid(uio) < sizeof(struct dirent))) {
+ if (uio_resid(uio) < sizeof(struct dirent))
return EINVAL;
- }
tresid = uio->uio_resid;
err = fuse_filehandle_get_dir(vp, &fufh, cred, pid);
