Module Name: src Committed By: hannken Date: Fri May 1 08:43:37 UTC 2020
Modified Files: src/sys/ufs/ufs: ufs_vfsops.c Log Message: There is no difference between a zero-sized and not yet reclaimed directory vnode and a non-existent vnode. Teach ufs_fhtovp() to treat zero-sized directories as stale. PR kern/55211 (fs/vfs/t_vnops:nfs_dir_rmdirdotdot test fails) To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/ufs/ufs/ufs_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/ufs/ufs/ufs_vfsops.c diff -u src/sys/ufs/ufs/ufs_vfsops.c:1.59 src/sys/ufs/ufs/ufs_vfsops.c:1.60 --- src/sys/ufs/ufs/ufs_vfsops.c:1.59 Fri Jan 17 20:08:10 2020 +++ src/sys/ufs/ufs/ufs_vfsops.c Fri May 1 08:43:37 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_vfsops.c,v 1.59 2020/01/17 20:08:10 ad Exp $ */ +/* $NetBSD: ufs_vfsops.c,v 1.60 2020/05/01 08:43:37 hannken Exp $ */ /* * Copyright (c) 1991, 1993, 1994 @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.59 2020/01/17 20:08:10 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.60 2020/05/01 08:43:37 hannken Exp $"); #if defined(_KERNEL_OPT) #include "opt_ffs.h" @@ -247,7 +247,8 @@ ufs_fhtovp(struct mount *mp, struct ufid } ip = VTOI(nvp); KASSERT(ip != NULL); - if (ip->i_mode == 0 || ip->i_gen != ufhp->ufid_gen) { + if (ip->i_mode == 0 || ip->i_gen != ufhp->ufid_gen || + ((ip->i_mode & IFMT) == IFDIR && ip->i_size == 0)) { vput(nvp); *vpp = NULLVP; return (ESTALE);