Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In the new world order (a.k.a. the human-understandable world order)

Browse Source 
VOP_LOOKUP ignores LOCKPARENT completely, so make this ignore it also.

XXX: tested only with rump, but I can't really see how this worked
at all before
This commit is contained in:
pooka 2007-08-17 17:44:43 +00:00
parent 4385b647e7
commit 1b189c72ab
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/fs/hfs/hfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hfs_vnops.c,v 1.3 2007/03/22 13:21:28 dillo Exp $ */
/* $NetBSD: hfs_vnops.c,v 1.4 2007/08/17 17:44:43 pooka Exp $ */
/*-
* Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.3 2007/03/22 13:21:28 dillo Exp $");
__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.4 2007/08/17 17:44:43 pooka Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@ -336,7 +336,6 @@ hfs_vop_lookup(void *v)
const char *pname;
int error;
int flags;
int lockparent; /* 1 => lockparent flag is set */
int result; /* result of libhfs operations */
#ifdef HFS_DEBUG
@ -356,7 +355,6 @@ hfs_vop_lookup(void *v)
*vpp = NULL;
flags = cnp->cn_flags;
lockparent = flags & LOCKPARENT;
/*
@ -392,16 +390,9 @@ hfs_vop_lookup(void *v)
/*printf("DOTDOT ");*/
VOP_UNLOCK(pdp, 0); /* race to get the inode */
error = VFS_VGET(vdp->v_mount, dp->h_parent, &tdp);
if (error != 0) {
vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY);
vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY);
if (error != 0)
goto error;
}
if (lockparent && (flags & ISLASTCN)) {
if ((error = vn_lock(pdp, LK_EXCLUSIVE)) != 0) {
vput(tdp);
goto error;
}
}
*vpp = tdp;
/* } else if (dp->h_rec.cnid == rec.file.cnid) {*/
} else if (cnp->cn_namelen == 1 && pname[0] == '.') {
@ -468,9 +459,6 @@ hfs_vop_lookup(void *v)
error = VFS_VGET(vdp->v_mount, rec.file.cnid, &tdp);
if (error != 0)
goto error;
if (!lockparent || !(flags & ISLASTCN)) {
VOP_UNLOCK(pdp, 0);
}
*vpp = tdp;
}
/*printf("\n");*/