Index: sys/fs/fuse/fuse_vnops.c
===================================================================
--- sys/fs/fuse/fuse_vnops.c	(revisione 238701)
+++ sys/fs/fuse/fuse_vnops.c	(copia locale)
@@ -871,6 +871,12 @@ calldaemon:
 			if (nid == VTOI(dvp)) {
 				vref(dvp);
 				*vpp = dvp;
+
+				/*
+				 * Save the name for use in VOP_RMDIR and
+				 * VOP_REMOVE later.
+				 */
+				cnp->cn_flags |= SAVENAME;
 				goto out;
 			}
 			err = fuse_vnode_get(dvp->v_mount,
@@ -884,6 +890,12 @@ calldaemon:
 			}
 			*vpp = vp;
 
+			/*
+			 * Save the name for use in VOP_RMDIR and VOP_REMOVE
+			 * later.
+			 */
+			cnp->cn_flags |= SAVENAME;
+
 			goto out;
 
 		}
Index: sys/fs/fuse/fuse.h
===================================================================
--- sys/fs/fuse/fuse.h	(revisione 238701)
+++ sys/fs/fuse/fuse.h	(copia locale)
@@ -56,7 +56,7 @@
 #include "fuse_version.h"
 #include "fuse_kernel.h"
 
-#define FUSE_DEFAULT_DAEMON_TIMEOUT                60     /* s */
+#define FUSE_DEFAULT_DAEMON_TIMEOUT                20     /* s */
 #define FUSE_MIN_DAEMON_TIMEOUT                    0      /* s */
 #define FUSE_MAX_DAEMON_TIMEOUT                    600    /* s */