diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-02-23 14:27:07 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-02-23 14:27:07 +0000 |
| commit | bad62913f157ac5d66b1225cb448c5d7b7f44a74 (patch) | |
| tree | 8844a5d8936cafc947907e9989cd33e14bb71d8f | |
| parent | 8e434a5fe09327a20967b1546f7c325d3c6bf481 (diff) | |
backout previous revision -- on nfs2 mounts (perhaps only automounted?) it
tends to .nfs silly files lying around during high filesystem activity.
whatever bug it was trying to fix, it made things worse.
| -rw-r--r-- | sys/nfs/nfs_vnops.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 9cc06201a50..29e2fff5af4 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vnops.c,v 1.71 2007/01/21 15:52:39 pedro Exp $ */ +/* $OpenBSD: nfs_vnops.c,v 1.72 2007/02/23 14:27:06 deraadt Exp $ */ /* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */ /* @@ -1457,16 +1457,7 @@ nfs_removerpc(dvp, name, namelen, cred, proc) caddr_t bpos, dpos, cp2; int error = 0, wccflag = NFSV3_WCCRATTR; struct mbuf *mreq, *mrep, *md, *mb, *mb2; - int v3; - - /* - * It is possible for our directory vnode to have been flushed out - * before us. If that's the case, we can't remove the file. - */ - if (dvp->v_type == VBAD) - return (EIO); - - v3 = NFS_ISV3(dvp); + int v3 = NFS_ISV3(dvp); nfsstats.rpccnt[NFSPROC_REMOVE]++; nfsm_reqhead(dvp, NFSPROC_REMOVE, |